diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index de322e4..466cdd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -10,15 +10,12 @@
 import com.casic.app.smartwell.BuildConfig
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.appendDownloadUrl
-import com.casic.app.smartwell.model.UserDetailModel
 import com.casic.app.smartwell.utils.DialogHelper
 import com.casic.app.smartwell.utils.LocaleConstant
 import com.casic.app.smartwell.view.AboutUsActivity
 import com.casic.app.smartwell.view.HelpCenterActivity
 import com.casic.app.smartwell.view.UserDetailActivity
 import com.casic.app.smartwell.vm.UserViewModel
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.callback.OnDownloadListener
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
@@ -36,8 +33,6 @@
 class MinePageFragment : KotlinBaseFragment() {
 
     private val kTag = "MinePageFragment"
-    private val gson = Gson()
-    private lateinit var userDataModel: UserDetailModel.DataBean
     private lateinit var userViewModel: UserViewModel
     private lateinit var progressDialog: ProgressDialog
 
@@ -48,14 +43,6 @@
     }
 
     override fun initData() {
-        val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String
-        if (userDetailJson.isNotBlank()) {
-            userDataModel = gson.fromJson(
-                userDetailJson,
-                object : TypeToken<UserDetailModel.DataBean>() {}.type
-            )
-            userNameView.text = userDataModel.name
-        }
         userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
         //初始化下载对话框
         progressDialog = ProgressDialog(requireContext())
@@ -125,6 +112,17 @@
                 }
             }
         })
+
+        userViewModel.userDetailModel.observe(this, {
+            if (it.code == 200) {
+                userNameView.text = it.data.name
+            }
+        })
+    }
+
+    override fun onResume() {
+        userViewModel.obtainUserDetail()
+        super.onResume()
     }
 
     private fun downloadApk(url: String?) {

diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index de322e4..466cdd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -10,15 +10,12 @@
 import com.casic.app.smartwell.BuildConfig
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.appendDownloadUrl
-import com.casic.app.smartwell.model.UserDetailModel
 import com.casic.app.smartwell.utils.DialogHelper
 import com.casic.app.smartwell.utils.LocaleConstant
 import com.casic.app.smartwell.view.AboutUsActivity
 import com.casic.app.smartwell.view.HelpCenterActivity
 import com.casic.app.smartwell.view.UserDetailActivity
 import com.casic.app.smartwell.vm.UserViewModel
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.callback.OnDownloadListener
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
@@ -36,8 +33,6 @@
 class MinePageFragment : KotlinBaseFragment() {
 
     private val kTag = "MinePageFragment"
-    private val gson = Gson()
-    private lateinit var userDataModel: UserDetailModel.DataBean
     private lateinit var userViewModel: UserViewModel
     private lateinit var progressDialog: ProgressDialog
 
@@ -48,14 +43,6 @@
     }
 
     override fun initData() {
-        val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String
-        if (userDetailJson.isNotBlank()) {
-            userDataModel = gson.fromJson(
-                userDetailJson,
-                object : TypeToken<UserDetailModel.DataBean>() {}.type
-            )
-            userNameView.text = userDataModel.name
-        }
         userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
         //初始化下载对话框
         progressDialog = ProgressDialog(requireContext())
@@ -125,6 +112,17 @@
                 }
             }
         })
+
+        userViewModel.userDetailModel.observe(this, {
+            if (it.code == 200) {
+                userNameView.text = it.data.name
+            }
+        })
+    }
+
+    override fun onResume() {
+        userViewModel.obtainUserDetail()
+        super.onResume()
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
index 1337454..2062ad1 100644
--- a/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
+++ b/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
@@ -47,7 +47,7 @@
         private String bfztName;
         private String coordinateX;
         private String coordinateY;
-        private double deep;
+        private String deep;
         private String deptName;
         private String deptid;
         private String id;
@@ -108,11 +108,11 @@
             this.coordinateY = coordinateY;
         }
 
-        public double getDeep() {
+        public String getDeep() {
             return deep;
         }
 
-        public void setDeep(double deep) {
+        public void setDeep(String deep) {
             this.deep = deep;
         }
 

diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index de322e4..466cdd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -10,15 +10,12 @@
 import com.casic.app.smartwell.BuildConfig
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.appendDownloadUrl
-import com.casic.app.smartwell.model.UserDetailModel
 import com.casic.app.smartwell.utils.DialogHelper
 import com.casic.app.smartwell.utils.LocaleConstant
 import com.casic.app.smartwell.view.AboutUsActivity
 import com.casic.app.smartwell.view.HelpCenterActivity
 import com.casic.app.smartwell.view.UserDetailActivity
 import com.casic.app.smartwell.vm.UserViewModel
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.callback.OnDownloadListener
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
@@ -36,8 +33,6 @@
 class MinePageFragment : KotlinBaseFragment() {
 
     private val kTag = "MinePageFragment"
-    private val gson = Gson()
-    private lateinit var userDataModel: UserDetailModel.DataBean
     private lateinit var userViewModel: UserViewModel
     private lateinit var progressDialog: ProgressDialog
 
@@ -48,14 +43,6 @@
     }
 
     override fun initData() {
-        val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String
-        if (userDetailJson.isNotBlank()) {
-            userDataModel = gson.fromJson(
-                userDetailJson,
-                object : TypeToken<UserDetailModel.DataBean>() {}.type
-            )
-            userNameView.text = userDataModel.name
-        }
         userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
         //初始化下载对话框
         progressDialog = ProgressDialog(requireContext())
@@ -125,6 +112,17 @@
                 }
             }
         })
+
+        userViewModel.userDetailModel.observe(this, {
+            if (it.code == 200) {
+                userNameView.text = it.data.name
+            }
+        })
+    }
+
+    override fun onResume() {
+        userViewModel.obtainUserDetail()
+        super.onResume()
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
index 1337454..2062ad1 100644
--- a/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
+++ b/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
@@ -47,7 +47,7 @@
         private String bfztName;
         private String coordinateX;
         private String coordinateY;
-        private double deep;
+        private String deep;
         private String deptName;
         private String deptid;
         private String id;
@@ -108,11 +108,11 @@
             this.coordinateY = coordinateY;
         }
 
-        public double getDeep() {
+        public String getDeep() {
             return deep;
         }
 
-        public void setDeep(double deep) {
+        public void setDeep(String deep) {
             this.deep = deep;
         }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt
index 2cc0d3b..422e4ed 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt
@@ -4,6 +4,7 @@
 import android.view.WindowManager
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog
 
+//TODO 改为单例模式
 object DialogHelper {
     private lateinit var loadingDialog: QMUITipDialog
 

diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
index de322e4..466cdd6 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
@@ -10,15 +10,12 @@
 import com.casic.app.smartwell.BuildConfig
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.extensions.appendDownloadUrl
-import com.casic.app.smartwell.model.UserDetailModel
 import com.casic.app.smartwell.utils.DialogHelper
 import com.casic.app.smartwell.utils.LocaleConstant
 import com.casic.app.smartwell.view.AboutUsActivity
 import com.casic.app.smartwell.view.HelpCenterActivity
 import com.casic.app.smartwell.view.UserDetailActivity
 import com.casic.app.smartwell.vm.UserViewModel
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.callback.OnDownloadListener
 import com.pengxh.kt.lite.extensions.createDownloadFileDir
@@ -36,8 +33,6 @@
 class MinePageFragment : KotlinBaseFragment() {
 
     private val kTag = "MinePageFragment"
-    private val gson = Gson()
-    private lateinit var userDataModel: UserDetailModel.DataBean
     private lateinit var userViewModel: UserViewModel
     private lateinit var progressDialog: ProgressDialog
 
@@ -48,14 +43,6 @@
     }
 
     override fun initData() {
-        val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String
-        if (userDetailJson.isNotBlank()) {
-            userDataModel = gson.fromJson(
-                userDetailJson,
-                object : TypeToken<UserDetailModel.DataBean>() {}.type
-            )
-            userNameView.text = userDataModel.name
-        }
         userViewModel = ViewModelProvider(this).get(UserViewModel::class.java)
         //初始化下载对话框
         progressDialog = ProgressDialog(requireContext())
@@ -125,6 +112,17 @@
                 }
             }
         })
+
+        userViewModel.userDetailModel.observe(this, {
+            if (it.code == 200) {
+                userNameView.text = it.data.name
+            }
+        })
+    }
+
+    override fun onResume() {
+        userViewModel.obtainUserDetail()
+        super.onResume()
     }
 
     private fun downloadApk(url: String?) {
diff --git a/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java b/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
index 1337454..2062ad1 100644
--- a/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
+++ b/app/src/main/java/com/casic/app/smartwell/model/MapWellListModel.java
@@ -47,7 +47,7 @@
         private String bfztName;
         private String coordinateX;
         private String coordinateY;
-        private double deep;
+        private String deep;
         private String deptName;
         private String deptid;
         private String id;
@@ -108,11 +108,11 @@
             this.coordinateY = coordinateY;
         }
 
-        public double getDeep() {
+        public String getDeep() {
             return deep;
         }
 
-        public void setDeep(double deep) {
+        public void setDeep(String deep) {
             this.deep = deep;
         }
 
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt
index 2cc0d3b..422e4ed 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt
@@ -4,6 +4,7 @@
 import android.view.WindowManager
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog
 
+//TODO 改为单例模式
 object DialogHelper {
     private lateinit var loadingDialog: QMUITipDialog
 
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogManager.kt
new file mode 100644
index 0000000..0041187
--- /dev/null
+++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogManager.kt
@@ -0,0 +1,37 @@
+package com.casic.app.smartwell.utils;
+
+import android.app.Activity
+import android.view.WindowManager
+import com.pengxh.kt.lite.base.BaseSingleton
+import com.qmuiteam.qmui.widget.dialog.QMUITipDialog
+
+class DialogManager private constructor(private val activity: Activity) {
+
+    private lateinit var loadingDialog: QMUITipDialog
+
+    companion object : BaseSingleton<Activity, DialogManager>() {
+        override val creator: (Activity) -> DialogManager
+            get() = ::DialogManager
+    }
+
+    fun showLoadingDialog(message: String) {
+        loadingDialog = QMUITipDialog
+            .Builder(activity)
+            .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+            .setTipWord(message)
+            .create()
+        if (!activity.isDestroyed) {
+            try {
+                loadingDialog.show()
+            } catch (e: WindowManager.BadTokenException) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    fun dismissLoadingDialog() {
+        if (loadingDialog.isShowing) {
+            loadingDialog.dismiss()
+        }
+    }
+}