diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/task.png b/app/src/main/res/mipmap-xxxhdpi/task.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/task.png b/app/src/main/res/mipmap-xxxhdpi/task.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/task_selected.png b/app/src/main/res/mipmap-xxxhdpi/task_selected.png
old mode 100755
new mode 100644
Binary files differ

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d6bfba4..7d66ebd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.7.1" />
+        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Dev/Gradle/gradle-6.7.1" />
         <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
diff --git a/app/build.gradle b/app/build.gradle
index 1f52e15..e4c1e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@
 android {
     signingConfigs {
         config {
-            storeFile file('/Users/a203/Desktop/AndroidProjects/Xuzhou/Meterage/app/Meterage.jks')
+            storeFile file('Meterage.jks')
             storePassword '123456789'
             keyAlias 'key0'
             keyPassword '123456789'
@@ -106,7 +106,7 @@
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     //Google官方授权框架
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
index 7a08ca1..b90e814 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt
@@ -46,7 +46,7 @@
 import com.pengxh.kt.lite.extensions.setAnimation
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 import java.util.Timer
@@ -264,8 +264,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "签到中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(requireActivity(), "签到中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
index de6eb8e..ba7d3e4 100644
--- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt
@@ -38,7 +38,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -255,12 +255,12 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(
+                LoadState.Loading -> LoadingDialog.show(
                     requireActivity(),
                     "头像更新中，请稍后..."
                 )
 
-                else -> LoadingDialogHub.dismiss()
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
index 4cdfe86..1bfc2b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ChangePasswordActivity.kt
@@ -13,7 +13,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog
 import java.nio.charset.StandardCharsets
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "修改中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "修改中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
index dd1a4ce..6119c37 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/FeedbackActivity.kt
@@ -29,11 +29,13 @@
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.pengxh.kt.lite.adapter.EditableImageAdapter
+import com.pengxh.kt.lite.extensions.dp2px
+import com.pengxh.kt.lite.extensions.getScreenWidth
 import com.pengxh.kt.lite.extensions.isPhoneNumber
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
@@ -70,7 +72,8 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        imageAdapter = EditableImageAdapter(this, 1, 3)
+        val width = getScreenWidth() - 20.dp2px(this)
+        imageAdapter = EditableImageAdapter(this, realPaths, width, 9, 3)
         binding.addImageRecyclerView.adapter = imageAdapter
 
         fileUploadViewModel = ViewModelProvider(this)[FileViewModel::class.java]
@@ -81,7 +84,7 @@
                     imagePaths.add(url)
                     realPaths.add(url.combineImagePath())
                 }
-                imageAdapter.setupImage(images = realPaths)
+                imageAdapter.notifyDataSetChanged()
             }
         }
 
@@ -103,15 +106,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "图片上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "提交反馈中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "提交反馈中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
@@ -149,7 +152,8 @@
 
             override fun onItemLongClick(view: View?, position: Int) {
                 imagePaths.removeAt(position)
-                imageAdapter.deleteImage(position)
+                realPaths.removeAt(position)
+                imageAdapter.notifyDataSetChanged()
             }
         })
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
index d05326b..69b7061 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt
@@ -15,7 +15,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 
 class LoginActivity : ApplicationBaseActivity<ActivityLoginBinding>() {
@@ -101,8 +101,8 @@
     override fun observeRequestState() {
         userViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "登录中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
index 2e2649e..078b4f0 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanDeviceResultActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ScanDeviceResultActivity : ApplicationBaseActivity<ActivityScanDeviceResultBinding>() {
@@ -28,7 +28,7 @@
     private val tids = ArrayList<String>()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
@@ -132,8 +132,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "结果加载中，请稍后")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "结果加载中，请稍后")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
index 5f38f72..b9a8902 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/ScanSampleResultActivity.kt
@@ -43,7 +43,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
         args.forEach {
             tids.add(it)
         }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
index ef03de6..a5ad1a2 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/UserInfoActivity.kt
@@ -27,7 +27,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.ActivityStackManager
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -192,8 +192,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "头像更新中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "头像更新中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
index 51df8f2..8852a17 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/VersionHistoryActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -80,8 +80,8 @@
     override fun observeRequestState() {
         fileViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
index 0340324..493a6b5 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ApprovalOperationActivity.kt
@@ -12,7 +12,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.SaveKeyValues
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -24,7 +24,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        taskId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        taskId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
index feb5cd0..8abc16b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/BusinessStatisticsActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
index ce9f2c3..5ae86b1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -84,8 +84,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
index 30b5648..09f0b66 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt
@@ -9,7 +9,7 @@
 import com.casic.xz.meterage.vm.CapabilityViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CapabilityDetailActivity : ApplicationBaseActivity<ActivityCapabilityDetailBinding>() {
@@ -17,7 +17,7 @@
     private lateinit var capabilityViewModel: CapabilityViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val id = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val id = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
         capabilityViewModel.getCapabilityDetail(this, id)
@@ -49,8 +49,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
index a52dd86..5dbb5b8 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CertificateReportDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 
 class CertificateReportDetailActivity :
     ApplicationBaseActivity<ActivityCertificateDetailBinding>() {
@@ -26,7 +26,7 @@
     private lateinit var certificateViewModel: CertificateViewModel
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         when (args[0]) {
             "草稿箱" -> {
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         certificateViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
index f4e07a8..4fb0e55 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractDetailActivity.kt
@@ -14,7 +14,7 @@
 import com.casic.xz.meterage.vm.ContractInvoiceViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class ContractDetailActivity : ApplicationBaseActivity<ActivityContractDetailBinding>() {
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val contractId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val contractId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         constructViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
         constructViewModel.getContractDetail(this, contractId)
         constructViewModel.contractDetail.observe(this) {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         constructViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
index 0aec77f..e961b2e 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/ContractInvoiceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -86,8 +86,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
index a57f3f3..0bd38fe 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
index e8f9e27..5584664 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt
@@ -16,7 +16,7 @@
 import com.casic.xz.meterage.vm.CustomerViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class CustomerDetailActivity : ApplicationBaseActivity<ActivityCustomerDetailBinding>() {
@@ -25,7 +25,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val customerId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val customerId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
         customerViewModel.getCustomerDetail(this, customerId)
@@ -67,8 +67,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
index c2bf2f5..a4c10c1 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DeptComprehensiveActivity.kt
@@ -14,7 +14,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DeptComprehensiveActivity : ApplicationBaseActivity<ActivityDeptComprehensiveBinding>() {
@@ -69,8 +69,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
index d059b15..02d484b 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/DetectionSampleDetailActivity.kt
@@ -13,7 +13,7 @@
 import com.casic.xz.meterage.vm.DetectionViewModel
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class DetectionSampleDetailActivity :
@@ -40,7 +40,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        val args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         detectionViewModel = ViewModelProvider(this)[DetectionViewModel::class.java]
         detectionViewModel.getDetectionDetail(this, args[0], args[1])
@@ -66,8 +66,8 @@
     override fun observeRequestState() {
         detectionViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
index 0e89e3b..0a6237d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt
@@ -18,7 +18,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 
 class EntrustActivity : ApplicationBaseActivity<ActivityEntrustBinding>(), Handler.Callback {
@@ -98,8 +98,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
index b4c1dd9..73ed99a 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustAddActivity.kt
@@ -48,7 +48,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.extensions.timestampToDate
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -324,15 +324,15 @@
     override fun observeRequestState() {
         fileUploadViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "文件上传中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "文件上传中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
 
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "委托创建中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "委托创建中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
index 5ecc6a6..2d88c94 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustDetailActivity.kt
@@ -15,7 +15,7 @@
 import com.casic.xz.meterage.widgets.AlertReturnControlDialog
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
 class EntrustDetailActivity : ApplicationBaseActivity<ActivityEntrustDetailBinding>() {
@@ -26,7 +26,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        entrustId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        entrustId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
         //获取委托书基本信息
@@ -121,8 +121,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
index f208d05..36d3827 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -93,8 +93,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
index b58c891..fdb87a9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt
@@ -18,7 +18,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val equipmentId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(equipmentId))
 //        fragmentPages.add(WeeklyRecordFragment())
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
index af55ca5..b0a6741 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
index ff52af9..9cbe803 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt
@@ -21,7 +21,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val trainId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         val userViewModel = ViewModelProvider(this)[UserViewModel::class.java]
         userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String)
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
index 2825a27..cf04885 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OutfieldDetectionDetailActivity.kt
@@ -35,7 +35,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
+        args = intent.getStringArrayListExtra(Constant.INTENT_PARAM_KEY)!!
 
         //TODO 是否需要在APP操作审批，待定
         binding.approvalView.visibility = View.GONE
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
index bea96c7..ba1a8d6 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeDeviceActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
index 2cd8c3a..ee98140 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/OvertimeEquipActivity.kt
@@ -19,7 +19,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
@@ -95,8 +95,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
index ddd2a63..fee8df9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/RealTimeWorkActivity.kt
@@ -11,7 +11,7 @@
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 
 class RealTimeWorkActivity : ApplicationBaseActivity<ActivityRealtimeWorkBinding>() {
@@ -65,8 +65,8 @@
     override fun observeRequestState() {
         statisticsViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
index 180eb21..bac0549 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/SelectCustomerActivity.kt
@@ -17,7 +17,7 @@
 import com.pengxh.kt.lite.extensions.convertColor
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -87,8 +87,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
index c514910..1b59691 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -94,8 +94,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
index 739b16d..5eb0d0f 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt
@@ -20,7 +20,7 @@
     private var fragmentPages: ArrayList<Fragment> = ArrayList()
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val deviceId = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         fragmentPages.add(BasicInformationFragment(deviceId))
         fragmentPages.add(MeasurementStaffFragment(deviceId))
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
index 90d1983..1b1a836 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardFileDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val fileDetail = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<StandardFileModel.DataModel.RowsModel>(
             fileDetail, object : TypeToken<StandardFileModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
index e9eb6ce..910a8ba 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/home/WriteSampleActivity.kt
@@ -24,7 +24,7 @@
 import com.pengxh.kt.lite.extensions.realFilePath
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
 import java.io.File
@@ -141,8 +141,8 @@
     override fun observeRequestState() {
         sampleViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "样品写入中，请稍后...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "样品写入中，请稍后...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
index 92d6b7c..b1703b4 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt
@@ -20,7 +20,7 @@
     private val gson by lazy { Gson() }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val noticeJson = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         val dataRow = gson.fromJson<NoticeListModel.DataModel.RowsModel>(
             noticeJson, object : TypeToken<NoticeListModel.DataModel.RowsModel>() {}.type
         )
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
index aeb2f38..1848b5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewPdfActivity.kt
@@ -9,7 +9,7 @@
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 import java.io.FileInputStream
@@ -17,18 +17,18 @@
 class PreviewPdfActivity : ApplicationBaseActivity<ActivityPreviewPdfBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("pdf")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     val inputStream = FileInputStream(file)
                     binding.pdfView.fromStream(inputStream).load()
                 }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
index ae688cf..d0d5809 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/notice/PreviewTextActivity.kt
@@ -10,25 +10,25 @@
 import com.pengxh.kt.lite.extensions.read
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.FileDownloadManager
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.TitleBarView
 import java.io.File
 
 class PreviewTextActivity : ApplicationBaseActivity<ActivityPreviewTxtBinding>() {
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        val minioFileName = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
         binding.titleView.setTitle(minioFileName)
 
         val url = minioFileName.combineFilePath()
-        LoadingDialogHub.show(this, "附件加载中")
+        LoadingDialog.show(this, "附件加载中")
         FileDownloadManager.Builder()
             .setDownloadFileSource(url)
             .setFileSaveDirectory(createDownloadFileDir())
             .setFileSuffix("")
             .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener {
                 override fun onDownloadEnd(file: File) {
-                    LoadingDialogHub.dismiss()
+                    LoadingDialog.dismiss()
                     binding. textView.text = file.read()
                 }
 
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
index 442d75e..e16b9c9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java]
@@ -131,8 +131,8 @@
     override fun observeRequestState() {
         capabilityViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
index c032b66..6af1667 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchContractResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -63,7 +63,7 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         contractViewModel = ViewModelProvider(this)[ContractInvoiceViewModel::class.java]
@@ -98,8 +98,8 @@
     override fun observeRequestState() {
         contractViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
index e79167b..d4b8e5d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         customerViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
index 66656a6..9e0afe9 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt
@@ -21,7 +21,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -39,7 +39,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         entrustViewModel = ViewModelProvider(this)[EntrustViewModel::class.java]
@@ -93,8 +93,8 @@
     override fun observeRequestState() {
         entrustViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
index 1ded3d3..47819c3 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
index e53a53a..0a9148d 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchGlobalResultActivity.kt
@@ -20,7 +20,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -38,7 +38,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         searchViewModel = ViewModelProvider(this)[GlobalSearchViewModel::class.java]
@@ -126,8 +126,8 @@
                 return@observe
             }
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
index a503d91..8141585 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt
@@ -25,7 +25,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -43,7 +43,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java]
@@ -97,8 +97,8 @@
     override fun observeRequestState() {
         meterageTrainViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
index 4c7b066..93a9e54 100644
--- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
+++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt
@@ -22,7 +22,7 @@
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.Constant
 import com.pengxh.kt.lite.utils.LoadState
-import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.utils.WeakReferenceHandler
 import com.pengxh.kt.lite.widget.TitleBarView
 
@@ -40,7 +40,7 @@
     private var isLoadMore = false
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        param = intent.getStringExtra(Constant.INTENT_PARAM)!!
+        param = intent.getStringExtra(Constant.INTENT_PARAM_KEY)!!
 
         weakReferenceHandler = WeakReferenceHandler(this)
         equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java]
@@ -94,8 +94,8 @@
     override fun observeRequestState() {
         equipmentViewModel.loadState.observe(this) {
             when (it) {
-                LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...")
-                else -> LoadingDialogHub.dismiss()
+                LoadState.Loading -> LoadingDialog.show(this, "数据加载中...")
+                else -> LoadingDialog.dismiss()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_approval_operation.xml b/app/src/main/res/layout/activity_approval_operation.xml
index ed6c168..f352afe 100644
--- a/app/src/main/res/layout/activity_approval_operation.xml
+++ b/app/src/main/res/layout/activity_approval_operation.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="审批"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_business_statistics.xml b/app/src/main/res/layout/activity_business_statistics.xml
index d12b9aa..b5d7954 100644
--- a/app/src/main/res/layout/activity_business_statistics.xml
+++ b/app/src/main/res/layout/activity_business_statistics.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml
index f89cb4f..7bfc81d 100644
--- a/app/src/main/res/layout/activity_capability.xml
+++ b/app/src/main/res/layout/activity_capability.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_capability_detail.xml b/app/src/main/res/layout/activity_capability_detail.xml
index 84eb49b..8320e22 100644
--- a/app/src/main/res/layout/activity_capability_detail.xml
+++ b/app/src/main/res/layout/activity_capability_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_certificate.xml b/app/src/main/res/layout/activity_certificate.xml
index 3940806..77ac39f 100644
--- a/app/src/main/res/layout/activity_certificate.xml
+++ b/app/src/main/res/layout/activity_certificate.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="证书报告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 523a211..1a7258f 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="修改密码"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_detail.xml b/app/src/main/res/layout/activity_contract_detail.xml
index de1f003..0535f40 100644
--- a/app/src/main/res/layout/activity_contract_detail.xml
+++ b/app/src/main/res/layout/activity_contract_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="发票合同"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_contract_invoice.xml b/app/src/main/res/layout/activity_contract_invoice.xml
index a5ed0b6..86ebabb 100644
--- a/app/src/main/res/layout/activity_contract_invoice.xml
+++ b/app/src/main/res/layout/activity_contract_invoice.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="合同发票"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml
index 15b90e4..cd7cfc8 100644
--- a/app/src/main/res/layout/activity_customer.xml
+++ b/app/src/main/res/layout/activity_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml
index 8ebea00..12b0651 100644
--- a/app/src/main/res/layout/activity_customer_detail.xml
+++ b/app/src/main/res/layout/activity_customer_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户详情"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_dept_comprehensive.xml b/app/src/main/res/layout/activity_dept_comprehensive.xml
index 0453309..527295b 100644
--- a/app/src/main/res/layout/activity_dept_comprehensive.xml
+++ b/app/src/main/res/layout/activity_dept_comprehensive.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="部门综合分析"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_detection_sample_detail.xml b/app/src/main/res/layout/activity_detection_sample_detail.xml
index 39311b9..9d04ca6 100644
--- a/app/src/main/res/layout/activity_detection_sample_detail.xml
+++ b/app/src/main/res/layout/activity_detection_sample_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品记录"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_entrust_add.xml b/app/src/main/res/layout/activity_entrust_add.xml
index c9ccef6..4e7c71c 100644
--- a/app/src/main/res/layout/activity_entrust_add.xml
+++ b/app/src/main/res/layout/activity_entrust_add.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="委托需求"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml
index 8cda8fd..30419e9 100644
--- a/app/src/main/res/layout/activity_equipment.xml
+++ b/app/src/main/res/layout/activity_equipment.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_equipment_detail.xml b/app/src/main/res/layout/activity_equipment_detail.xml
index 8689c2d..97c9e6f 100644
--- a/app/src/main/res/layout/activity_equipment_detail.xml
+++ b/app/src/main/res/layout/activity_equipment_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="仪器设备"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_feed_back.xml b/app/src/main/res/layout/activity_feed_back.xml
index 8cbc41f..5180572 100644
--- a/app/src/main/res/layout/activity_feed_back.xml
+++ b/app/src/main/res/layout/activity_feed_back.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="意见反馈"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml
index 549aa54..0dc2f98 100644
--- a/app/src/main/res/layout/activity_meterage_train.xml
+++ b/app/src/main/res/layout/activity_meterage_train.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_meterage_train_detail.xml b/app/src/main/res/layout/activity_meterage_train_detail.xml
index aa48398..41457e0 100644
--- a/app/src/main/res/layout/activity_meterage_train_detail.xml
+++ b/app/src/main/res/layout/activity_meterage_train_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="计量培训"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_detail.xml b/app/src/main/res/layout/activity_notice_detail.xml
index e02b1c3..3a77964 100644
--- a/app/src/main/res/layout/activity_notice_detail.xml
+++ b/app/src/main/res/layout/activity_notice_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="通知公告"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml
index 02cb06d..99169e0 100644
--- a/app/src/main/res/layout/activity_notice_list.xml
+++ b/app/src/main/res/layout/activity_notice_list.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@mipmap/message_blue"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="消息列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_outfield_detection.xml b/app/src/main/res/layout/activity_outfield_detection.xml
index 575ae6b..b81bbcd 100644
--- a/app/src/main/res/layout/activity_outfield_detection.xml
+++ b/app/src/main/res/layout/activity_outfield_detection.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="外场检测"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_device.xml b/app/src/main/res/layout/activity_overtime_device.xml
index 0c340c1..2847c77 100644
--- a/app/src/main/res/layout/activity_overtime_device.xml
+++ b/app/src/main/res/layout/activity_overtime_device.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="装置到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_overtime_equip.xml b/app/src/main/res/layout/activity_overtime_equip.xml
index 45584dd..48835c8 100644
--- a/app/src/main/res/layout/activity_overtime_equip.xml
+++ b/app/src/main/res/layout/activity_overtime_equip.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="设备到期列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml
index 4252766..482db8f 100644
--- a/app/src/main/res/layout/activity_preview_pdf.xml
+++ b/app/src/main/res/layout/activity_preview_pdf.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <com.github.barteksc.pdfviewer.PDFView
         android:id="@+id/pdfView"
diff --git a/app/src/main/res/layout/activity_preview_txt.xml b/app/src/main/res/layout/activity_preview_txt.xml
index 01f78b5..8dac2ca 100644
--- a/app/src/main/res/layout/activity_preview_txt.xml
+++ b/app/src/main/res/layout/activity_preview_txt.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="业务统计"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 30fa38f..82dac4e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="隐私政策"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_realtime_work.xml b/app/src/main/res/layout/activity_realtime_work.xml
index 342b090..717c71d 100644
--- a/app/src/main/res/layout/activity_realtime_work.xml
+++ b/app/src/main/res/layout/activity_realtime_work.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="实时工作"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_device_result.xml b/app/src/main/res/layout/activity_scan_device_result.xml
index be0978e..a48d60b 100644
--- a/app/src/main/res/layout/activity_scan_device_result.xml
+++ b/app/src/main/res/layout/activity_scan_device_result.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_scan_sample_result.xml b/app/src/main/res/layout/activity_scan_sample_result.xml
index 256d053..b77de84 100644
--- a/app/src/main/res/layout/activity_scan_sample_result.xml
+++ b/app/src/main/res/layout/activity_scan_sample_result.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标签扫描结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml
index 2e98a2c..9e43644 100644
--- a/app/src/main/res/layout/activity_search_capability_reasult.xml
+++ b/app/src/main/res/layout/activity_search_capability_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_contract_reasult.xml b/app/src/main/res/layout/activity_search_contract_reasult.xml
index 814f577..98934a6 100644
--- a/app/src/main/res/layout/activity_search_contract_reasult.xml
+++ b/app/src/main/res/layout/activity_search_contract_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml
index 0aff876..ab52d09 100644
--- a/app/src/main/res/layout/activity_search_customer_reasult.xml
+++ b/app/src/main/res/layout/activity_search_customer_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml
index 6ae34ae..7585ebb 100644
--- a/app/src/main/res/layout/activity_search_entrust_reasult.xml
+++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml
index eb1da4e..e309d7e 100644
--- a/app/src/main/res/layout/activity_search_equipment_reasult.xml
+++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_global_reasult.xml b/app/src/main/res/layout/activity_search_global_reasult.xml
index 50c5510..d82278f 100644
--- a/app/src/main/res/layout/activity_search_global_reasult.xml
+++ b/app/src/main/res/layout/activity_search_global_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
index ac24330..3007837 100644
--- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
+++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
index 42c66f6..73f7e7a 100644
--- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml
+++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="查询结果"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_country.xml b/app/src/main/res/layout/activity_select_country.xml
index 2de6a6a..471feb7 100644
--- a/app/src/main/res/layout/activity_select_country.xml
+++ b/app/src/main/res/layout/activity_select_country.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="厂家国别"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_customer.xml b/app/src/main/res/layout/activity_select_customer.xml
index 47d0d53..a6c84b5 100644
--- a/app/src/main/res/layout/activity_select_customer.xml
+++ b/app/src/main/res/layout/activity_select_customer.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="客户列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_select_sample.xml b/app/src/main/res/layout/activity_select_sample.xml
index 451ff3e..79587c8 100644
--- a/app/src/main/res/layout/activity_select_sample.xml
+++ b/app/src/main/res/layout/activity_select_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="样品列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml
index 5b2b209..8c8757b 100644
--- a/app/src/main/res/layout/activity_standard_device.xml
+++ b/app/src/main/res/layout/activity_standard_device.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_search"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_device_detail.xml b/app/src/main/res/layout/activity_standard_device_detail.xml
index ef92604..b2c90e1 100644
--- a/app/src/main/res/layout/activity_standard_device_detail.xml
+++ b/app/src/main/res/layout/activity_standard_device_detail.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准装置"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file.xml b/app/src/main/res/layout/activity_standard_file.xml
index 832b64a..ec9c351 100644
--- a/app/src/main/res/layout/activity_standard_file.xml
+++ b/app/src/main/res/layout/activity_standard_file.xml
@@ -11,13 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_standard_file_detail.xml b/app/src/main/res/layout/activity_standard_file_detail.xml
index 7fdd607..b3d9730 100644
--- a/app/src/main/res/layout/activity_standard_file_detail.xml
+++ b/app/src/main/res/layout/activity_standard_file_detail.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="标准规范"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index a58748a..b1f7ff4 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="用户信息"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 3e66902..1c2020c 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -12,13 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
-        app:tbv_text=""
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_smaller_title="true"
+        app:tbv_text_color="@color/black" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_version_history.xml b/app/src/main/res/layout/activity_version_history.xml
index 93cac7d..95fe3fb 100644
--- a/app/src/main/res/layout/activity_version_history.xml
+++ b/app/src/main/res/layout/activity_version_history.xml
@@ -12,13 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
-        app:tbv_right_image="@drawable/ic_title_right_black"
-        app:tbv_show_left_image="true"
-        app:tbv_show_right_image="false"
+        app:tbv_smaller_title="true"
         app:tbv_text="功能介绍"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_write_sample.xml b/app/src/main/res/layout/activity_write_sample.xml
index 0ad5eef..499fcfd 100644
--- a/app/src/main/res/layout/activity_write_sample.xml
+++ b/app/src/main/res/layout/activity_write_sample.xml
@@ -12,13 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tbv_left_image="@drawable/ic_title_left_black"
-        app:tbv_only_show_title="false"
         app:tbv_right_image="@drawable/ic_selected"
-        app:tbv_show_left_image="true"
         app:tbv_show_right_image="true"
+        app:tbv_smaller_title="true"
         app:tbv_text="能力列表"
-        app:tbv_text_color="@color/black"
-        app:tbv_text_size="@dimen/sp_16" />
+        app:tbv_text_color="@color/black" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/mipmap-xxxhdpi/home.png b/app/src/main/res/mipmap-xxxhdpi/home.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/home_selected.png b/app/src/main/res/mipmap-xxxhdpi/home_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_blue.png b/app/src/main/res/mipmap-xxxhdpi/message_blue.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/message_white.png b/app/src/main/res/mipmap-xxxhdpi/message_white.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine.png b/app/src/main/res/mipmap-xxxhdpi/mine.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_selected.png b/app/src/main/res/mipmap-xxxhdpi/mine_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/mine_top.png b/app/src/main/res/mipmap-xxxhdpi/mine_top.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/qr_code.png b/app/src/main/res/mipmap-xxxhdpi/qr_code.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/task.png b/app/src/main/res/mipmap-xxxhdpi/task.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/task_selected.png b/app/src/main/res/mipmap-xxxhdpi/task_selected.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644