diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
index 20807e9..ea76cb7 100644
--- a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
+++ b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
@@ -8,25 +8,6 @@
     return activity.findViewById<T>(this)
 }
 
-//窨井类型转换
-fun Int.valueToType(): String {
-    return when (this) {
-        1 -> "雨水井"
-        2 -> "污水井"
-        3 -> "燃气井"
-        4 -> "热力井"
-        5 -> "电力井"
-        6 -> "交通井"
-        7 -> "路灯井"
-        8 -> "通信井"
-        9 -> "监控井"
-        10 -> "其他"
-        else -> {
-            "未知类型"
-        }
-    }
-}
-
 fun Int.toLevel(): String {
     return if (this == 0) {
         ""

diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
index 20807e9..ea76cb7 100644
--- a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
+++ b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
@@ -8,25 +8,6 @@
     return activity.findViewById<T>(this)
 }
 
-//窨井类型转换
-fun Int.valueToType(): String {
-    return when (this) {
-        1 -> "雨水井"
-        2 -> "污水井"
-        3 -> "燃气井"
-        4 -> "热力井"
-        5 -> "电力井"
-        6 -> "交通井"
-        7 -> "路灯井"
-        8 -> "通信井"
-        9 -> "监控井"
-        10 -> "其他"
-        else -> {
-            "未知类型"
-        }
-    }
-}
-
 fun Int.toLevel(): String {
     return if (this == 0) {
         ""
diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
index ac030f0..9e6d234 100644
--- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
@@ -66,6 +66,25 @@
     }
 }
 
+//窨井类型转换
+fun String.valueToType(): String {
+    return when (this) {
+        "1" -> "雨水井"
+        "2" -> "污水井"
+        "3" -> "燃气井"
+        "4" -> "热力井"
+        "5" -> "电力井"
+        "6" -> "交通井"
+        "7" -> "路灯井"
+        "8" -> "通信井"
+        "9" -> "监控井"
+        "10" -> "其他"
+        else -> {
+            "未知类型"
+        }
+    }
+}
+
 fun String.separateResponseCode(): Int {
     if (this.isBlank()) {
         return 404

diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
index 20807e9..ea76cb7 100644
--- a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
+++ b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
@@ -8,25 +8,6 @@
     return activity.findViewById<T>(this)
 }
 
-//窨井类型转换
-fun Int.valueToType(): String {
-    return when (this) {
-        1 -> "雨水井"
-        2 -> "污水井"
-        3 -> "燃气井"
-        4 -> "热力井"
-        5 -> "电力井"
-        6 -> "交通井"
-        7 -> "路灯井"
-        8 -> "通信井"
-        9 -> "监控井"
-        10 -> "其他"
-        else -> {
-            "未知类型"
-        }
-    }
-}
-
 fun Int.toLevel(): String {
     return if (this == 0) {
         ""
diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
index ac030f0..9e6d234 100644
--- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
@@ -66,6 +66,25 @@
     }
 }
 
+//窨井类型转换
+fun String.valueToType(): String {
+    return when (this) {
+        "1" -> "雨水井"
+        "2" -> "污水井"
+        "3" -> "燃气井"
+        "4" -> "热力井"
+        "5" -> "电力井"
+        "6" -> "交通井"
+        "7" -> "路灯井"
+        "8" -> "通信井"
+        "9" -> "监控井"
+        "10" -> "其他"
+        else -> {
+            "未知类型"
+        }
+    }
+}
+
 fun String.separateResponseCode(): Int {
     if (this.isBlank()) {
         return 404
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index b0f4d1d..cb2ff8f 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -17,6 +17,7 @@
 import com.amap.api.maps.model.*
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.HomeRecycleAdapter
+import com.casic.app.smartwell.extensions.valueToType
 import com.casic.app.smartwell.model.MapWellListModel
 import com.casic.app.smartwell.utils.DialogHelper
 import com.casic.app.smartwell.utils.LocaleConstant
@@ -344,8 +345,13 @@
             ) {
                 wellNameView.text = String.format("窨井名称: ${well.wellName}")
                 wellCodeView.text = String.format("窨井编号: ${well.wellCode}")
-                wellTypeView.text = String.format("窨井类型: ${well.wellTypeName}")
-                wellStateView.text = String.format("布/撤防状态: ${well.bfztName}")
+                wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}")
+                val bfztName = if (well.bfzt == "1") {
+                    "已布防"
+                } else {
+                    "已撤防"
+                }
+                wellStateView.text = String.format("布/撤防状态: $bfztName")
                 deepView.text = String.format("窨井深度: ${well.deep}m")
                 locationView.text = String.format("详细位置: ${well.position}")
                 return infoWindow

diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
index 20807e9..ea76cb7 100644
--- a/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
+++ b/app/src/main/java/com/casic/app/smartwell/extensions/Int.kt
@@ -8,25 +8,6 @@
     return activity.findViewById<T>(this)
 }
 
-//窨井类型转换
-fun Int.valueToType(): String {
-    return when (this) {
-        1 -> "雨水井"
-        2 -> "污水井"
-        3 -> "燃气井"
-        4 -> "热力井"
-        5 -> "电力井"
-        6 -> "交通井"
-        7 -> "路灯井"
-        8 -> "通信井"
-        9 -> "监控井"
-        10 -> "其他"
-        else -> {
-            "未知类型"
-        }
-    }
-}
-
 fun Int.toLevel(): String {
     return if (this == 0) {
         ""
diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
index ac030f0..9e6d234 100644
--- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt
@@ -66,6 +66,25 @@
     }
 }
 
+//窨井类型转换
+fun String.valueToType(): String {
+    return when (this) {
+        "1" -> "雨水井"
+        "2" -> "污水井"
+        "3" -> "燃气井"
+        "4" -> "热力井"
+        "5" -> "电力井"
+        "6" -> "交通井"
+        "7" -> "路灯井"
+        "8" -> "通信井"
+        "9" -> "监控井"
+        "10" -> "其他"
+        else -> {
+            "未知类型"
+        }
+    }
+}
+
 fun String.separateResponseCode(): Int {
     if (this.isBlank()) {
         return 404
diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
index b0f4d1d..cb2ff8f 100644
--- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt
@@ -17,6 +17,7 @@
 import com.amap.api.maps.model.*
 import com.casic.app.smartwell.R
 import com.casic.app.smartwell.adapter.HomeRecycleAdapter
+import com.casic.app.smartwell.extensions.valueToType
 import com.casic.app.smartwell.model.MapWellListModel
 import com.casic.app.smartwell.utils.DialogHelper
 import com.casic.app.smartwell.utils.LocaleConstant
@@ -344,8 +345,13 @@
             ) {
                 wellNameView.text = String.format("窨井名称: ${well.wellName}")
                 wellCodeView.text = String.format("窨井编号: ${well.wellCode}")
-                wellTypeView.text = String.format("窨井类型: ${well.wellTypeName}")
-                wellStateView.text = String.format("布/撤防状态: ${well.bfztName}")
+                wellTypeView.text = String.format("窨井类型: ${well.wellType.valueToType()}")
+                val bfztName = if (well.bfzt == "1") {
+                    "已布防"
+                } else {
+                    "已撤防"
+                }
+                wellStateView.text = String.format("布/撤防状态: $bfztName")
                 deepView.text = String.format("窨井深度: ${well.deep}m")
                 locationView.text = String.format("详细位置: ${well.position}")
                 return infoWindow
diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt
index 8a9a150..ca726a0 100644
--- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt
@@ -22,9 +22,8 @@
     const val ACCOUNT = "account"
     const val PASSWORD = "password"
     const val DEFAULT_SERVER_CONFIG = "defaultServerConfig"
-    const val DEFAULT_SERVER = "http://111.198.10.15:11309"
+    const val DEFAULT_SERVER = "http://60.208.121.150:5001"
     const val USER_DETAIL_MODEL = "userDetailModel"
-    const val INTENT_PARAM = "intentParam"
     const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider"
 
     val HOME_ICONS = arrayOf(R.drawable.ic_well, R.drawable.ic_overtime, R.drawable.ic_bfcf)