diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
index e0b3f6a..82995f2 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.extensions
 
 import android.graphics.Color
-import android.os.Looper
 import android.view.Gravity
 import android.widget.TextView
 import android.widget.Toast
@@ -30,12 +29,6 @@
 
 //将Toast扩展到String，任何线程都可以显示
 fun String.show() {
-    var toastLooper = Looper.myLooper()
-    if (toastLooper == null) {
-        Looper.prepare()
-        toastLooper = Looper.myLooper()
-    }
-
     val context = BaseApplication.obtainInstance()
     val toast = Toast(context)
     val textView = TextView(context)
@@ -53,11 +46,6 @@
     toast.view = textView
     toast.duration = Toast.LENGTH_SHORT
     toast.show()
-
-    if (toastLooper != null) {
-        Looper.loop()
-        toastLooper.quit()
-    }
 }
 
 fun String.isLetterAndDigit(): Boolean {

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
index e0b3f6a..82995f2 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.extensions
 
 import android.graphics.Color
-import android.os.Looper
 import android.view.Gravity
 import android.widget.TextView
 import android.widget.Toast
@@ -30,12 +29,6 @@
 
 //将Toast扩展到String，任何线程都可以显示
 fun String.show() {
-    var toastLooper = Looper.myLooper()
-    if (toastLooper == null) {
-        Looper.prepare()
-        toastLooper = Looper.myLooper()
-    }
-
     val context = BaseApplication.obtainInstance()
     val toast = Toast(context)
     val textView = TextView(context)
@@ -53,11 +46,6 @@
     toast.view = textView
     toast.duration = Toast.LENGTH_SHORT
     toast.show()
-
-    if (toastLooper != null) {
-        Looper.loop()
-        toastLooper.quit()
-    }
 }
 
 fun String.isLetterAndDigit(): Boolean {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 87cab8c..12cdd2d 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,10 +2,12 @@
 
 import android.graphics.Point
 import android.os.Bundle
-import android.util.Log
+import android.os.CountDownTimer
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +22,7 @@
 import com.casic.app.smartwell.sanxi.model.WellListModel
 import com.casic.app.smartwell.sanxi.utils.ChartViewHelper
 import com.casic.app.smartwell.sanxi.utils.Constant
+import com.casic.app.smartwell.sanxi.utils.DialogHelper
 import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
 import com.casic.app.smartwell.sanxi.vm.DeviceViewModel
 import com.casic.app.smartwell.sanxi.vm.WellViewModel
@@ -42,7 +45,7 @@
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
 
 class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener,
-    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnInfoWindowClickListener {
+    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter {
 
     private val kTag = "HomePageFragment"
     private lateinit var homeView: View
@@ -113,6 +116,8 @@
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
 
         //获取所有窨井数据
+        httpCountDownTimer.start()
+        DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...")
         wellViewModel.obtainAllWell()
         wellViewModel.allWellModel.observe(viewLifecycleOwner, {
             if (it.code == 200) {
@@ -139,10 +144,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -150,7 +155,7 @@
                 //移动到指定经纬度
                 val cameraPosition = CameraPosition(centerLatLng, 13f, 0f, 0f)
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
-                aMap.animateCamera(cameraUpdate, 3000, null)
+                aMap.animateCamera(cameraUpdate, 1500, null)
             }
         })
 
@@ -332,8 +337,6 @@
         aMap.addOnMarkerClickListener(this)
         // 点击marker弹出自定义popup
         aMap.setInfoWindowAdapter(this)
-        //信息窗点击事件
-        aMap.addOnInfoWindowClickListener(this)
     }
 
     override fun onMapLoaded() {
@@ -345,9 +348,25 @@
 
     }
 
+    /**
+     * http请求计时器
+     * */
+    private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) {
+        override fun onFinish() {
+            "请求服务器超时，请退出后重试".show()
+            DialogHelper.dismissLoadingDialog()
+        }
+
+        override fun onTick(millisUntilFinished: Long) {
+
+        }
+    }
+
     //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(p0: CameraPosition?) {
         //地图缩放之后显示聚合点数据
+        DialogHelper.dismissLoadingDialog()
+        httpCountDownTimer.cancel()
         initClustersMarkers()
     }
 
@@ -409,15 +428,16 @@
     }
 
     override fun getInfoWindow(marker: Marker?): View? {
+        val availableWidth = (SizeUtil.getScreenWidth(requireContext()) * 0.8).toInt()
         if (infoWindow == null) {
             infoWindow = LayoutInflater.from(requireContext()).inflate(R.layout.popu_map_info, null)
         }
-        val v = infoWindow!!
         //反射得到popup里面的控件对象
-        val wellTypeView = v.findViewById<TextView>(R.id.wellTypeView)
-        val wellCodeView = v.findViewById<TextView>(R.id.wellCodeView)
-        val ownerShipView = v.findViewById<TextView>(R.id.ownerShipView)
-        val locationView = v.findViewById<TextView>(R.id.locationView)
+        val wellTypeView = infoWindow!!.findViewById<TextView>(R.id.wellTypeView)
+        val wellCodeView = infoWindow!!.findViewById<TextView>(R.id.wellCodeView)
+        val ownerShipView = infoWindow!!.findViewById<TextView>(R.id.ownerShipView)
+        val locationView = infoWindow!!.findViewById<TextView>(R.id.locationView)
+        val navigateView = infoWindow!!.findViewById<ImageView>(R.id.navigateView)
 
         //绑定数据
         val clickedLatLng = marker?.position!!
@@ -428,7 +448,69 @@
                 wellTypeView.text = String.format("井类型: ${well.wellType.toTypeName()}")
                 wellCodeView.text = String.format("井编号: ${well.wellCode}")
                 ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}")
-                locationView.text = String.format("详细位置: ${well.position}")
+                val temp = String.format("详细位置: ${well.position}")
+
+                /**
+                 * 20是xml里面设置的window的内边距
+                 * */
+                val textPaint = ownerShipView.paint
+                if (textPaint.measureText(temp) <= availableWidth) {
+                    //如果整行宽度在控件可用宽度之内，就不处理了
+                    locationView.text = temp
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                } else {
+                    //如果整行宽度超过控件可用宽度，则按字符测量，在超过可用宽度的前一个字符处手动换行
+                    val wordWidth = textPaint.measureText(temp, 0, 1)
+                    val index = (availableWidth / wordWidth).toInt()
+                    val strings = temp.split("")
+                    val newTextBuilder = StringBuilder()
+                    for (i in strings.indices) {
+                        if (i == index) {
+                            newTextBuilder.append(strings[i]).append("\n")
+                        } else {
+                            newTextBuilder.append(strings[i])
+                        }
+                    }
+                    locationView.text = newTextBuilder
+                    //动态设置infoWindow宽高
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        availableWidth, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                }
+
+                navigateView.setOnClickListener {
+                    AlertControlDialog.Builder()
+                        .setContext(requireContext())
+                        .setTitle("操作提示")
+                        .setMessage("确定要前往吗")
+                        .setNegativeButton("取消")
+                        .setPositiveButton("确定")
+                        .setOnDialogButtonClickListener(object :
+                            AlertControlDialog.OnDialogButtonClickListener {
+                            override fun onConfirmClick() {
+                                val latLng = marker.position
+                                val lat = latLng.latitude.toString()
+                                val lng = latLng.longitude.toString()
+                                if (lat.isBlank() || lng.isBlank()) {
+                                    "窨井经纬度异常，无法开启导航".show()
+                                    return
+                                }
+                                Poi(
+                                    marker.snippet,
+                                    LatLng(lat.toDouble(), lng.toDouble()),
+                                    ""
+                                ).showRouteOnMap(
+                                    requireContext()
+                                )
+                            }
+
+                            override fun onCancelClick() {
+
+                            }
+                        }).build().show()
+                }
                 return infoWindow
             }
         }
@@ -441,36 +523,6 @@
      * */
     override fun getInfoContents(p0: Marker?): View? = null
 
-    override fun onInfoWindowClick(p0: Marker?) {
-        if (p0 != null) {
-            AlertControlDialog.Builder()
-                .setContext(requireContext())
-                .setTitle("操作提示")
-                .setMessage("确定要前往吗")
-                .setNegativeButton("取消")
-                .setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        val latLng = p0.position
-                        val lat = latLng.latitude.toString()
-                        val lng = latLng.longitude.toString()
-                        if (lat.isBlank() || lng.isBlank()) {
-                            "窨井经纬度异常，无法开启导航".show()
-                            return
-                        }
-                        Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap(
-                            requireContext()
-                        )
-                    }
-
-                    override fun onCancelClick() {
-
-                    }
-                }).build().show()
-        }
-    }
-
     /***以下是地图生命周期管理************************************************************************/
     override fun onResume() {
         super.onResume()

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
index e0b3f6a..82995f2 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.extensions
 
 import android.graphics.Color
-import android.os.Looper
 import android.view.Gravity
 import android.widget.TextView
 import android.widget.Toast
@@ -30,12 +29,6 @@
 
 //将Toast扩展到String，任何线程都可以显示
 fun String.show() {
-    var toastLooper = Looper.myLooper()
-    if (toastLooper == null) {
-        Looper.prepare()
-        toastLooper = Looper.myLooper()
-    }
-
     val context = BaseApplication.obtainInstance()
     val toast = Toast(context)
     val textView = TextView(context)
@@ -53,11 +46,6 @@
     toast.view = textView
     toast.duration = Toast.LENGTH_SHORT
     toast.show()
-
-    if (toastLooper != null) {
-        Looper.loop()
-        toastLooper.quit()
-    }
 }
 
 fun String.isLetterAndDigit(): Boolean {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 87cab8c..12cdd2d 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,10 +2,12 @@
 
 import android.graphics.Point
 import android.os.Bundle
-import android.util.Log
+import android.os.CountDownTimer
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +22,7 @@
 import com.casic.app.smartwell.sanxi.model.WellListModel
 import com.casic.app.smartwell.sanxi.utils.ChartViewHelper
 import com.casic.app.smartwell.sanxi.utils.Constant
+import com.casic.app.smartwell.sanxi.utils.DialogHelper
 import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
 import com.casic.app.smartwell.sanxi.vm.DeviceViewModel
 import com.casic.app.smartwell.sanxi.vm.WellViewModel
@@ -42,7 +45,7 @@
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
 
 class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener,
-    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnInfoWindowClickListener {
+    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter {
 
     private val kTag = "HomePageFragment"
     private lateinit var homeView: View
@@ -113,6 +116,8 @@
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
 
         //获取所有窨井数据
+        httpCountDownTimer.start()
+        DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...")
         wellViewModel.obtainAllWell()
         wellViewModel.allWellModel.observe(viewLifecycleOwner, {
             if (it.code == 200) {
@@ -139,10 +144,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -150,7 +155,7 @@
                 //移动到指定经纬度
                 val cameraPosition = CameraPosition(centerLatLng, 13f, 0f, 0f)
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
-                aMap.animateCamera(cameraUpdate, 3000, null)
+                aMap.animateCamera(cameraUpdate, 1500, null)
             }
         })
 
@@ -332,8 +337,6 @@
         aMap.addOnMarkerClickListener(this)
         // 点击marker弹出自定义popup
         aMap.setInfoWindowAdapter(this)
-        //信息窗点击事件
-        aMap.addOnInfoWindowClickListener(this)
     }
 
     override fun onMapLoaded() {
@@ -345,9 +348,25 @@
 
     }
 
+    /**
+     * http请求计时器
+     * */
+    private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) {
+        override fun onFinish() {
+            "请求服务器超时，请退出后重试".show()
+            DialogHelper.dismissLoadingDialog()
+        }
+
+        override fun onTick(millisUntilFinished: Long) {
+
+        }
+    }
+
     //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(p0: CameraPosition?) {
         //地图缩放之后显示聚合点数据
+        DialogHelper.dismissLoadingDialog()
+        httpCountDownTimer.cancel()
         initClustersMarkers()
     }
 
@@ -409,15 +428,16 @@
     }
 
     override fun getInfoWindow(marker: Marker?): View? {
+        val availableWidth = (SizeUtil.getScreenWidth(requireContext()) * 0.8).toInt()
         if (infoWindow == null) {
             infoWindow = LayoutInflater.from(requireContext()).inflate(R.layout.popu_map_info, null)
         }
-        val v = infoWindow!!
         //反射得到popup里面的控件对象
-        val wellTypeView = v.findViewById<TextView>(R.id.wellTypeView)
-        val wellCodeView = v.findViewById<TextView>(R.id.wellCodeView)
-        val ownerShipView = v.findViewById<TextView>(R.id.ownerShipView)
-        val locationView = v.findViewById<TextView>(R.id.locationView)
+        val wellTypeView = infoWindow!!.findViewById<TextView>(R.id.wellTypeView)
+        val wellCodeView = infoWindow!!.findViewById<TextView>(R.id.wellCodeView)
+        val ownerShipView = infoWindow!!.findViewById<TextView>(R.id.ownerShipView)
+        val locationView = infoWindow!!.findViewById<TextView>(R.id.locationView)
+        val navigateView = infoWindow!!.findViewById<ImageView>(R.id.navigateView)
 
         //绑定数据
         val clickedLatLng = marker?.position!!
@@ -428,7 +448,69 @@
                 wellTypeView.text = String.format("井类型: ${well.wellType.toTypeName()}")
                 wellCodeView.text = String.format("井编号: ${well.wellCode}")
                 ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}")
-                locationView.text = String.format("详细位置: ${well.position}")
+                val temp = String.format("详细位置: ${well.position}")
+
+                /**
+                 * 20是xml里面设置的window的内边距
+                 * */
+                val textPaint = ownerShipView.paint
+                if (textPaint.measureText(temp) <= availableWidth) {
+                    //如果整行宽度在控件可用宽度之内，就不处理了
+                    locationView.text = temp
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                } else {
+                    //如果整行宽度超过控件可用宽度，则按字符测量，在超过可用宽度的前一个字符处手动换行
+                    val wordWidth = textPaint.measureText(temp, 0, 1)
+                    val index = (availableWidth / wordWidth).toInt()
+                    val strings = temp.split("")
+                    val newTextBuilder = StringBuilder()
+                    for (i in strings.indices) {
+                        if (i == index) {
+                            newTextBuilder.append(strings[i]).append("\n")
+                        } else {
+                            newTextBuilder.append(strings[i])
+                        }
+                    }
+                    locationView.text = newTextBuilder
+                    //动态设置infoWindow宽高
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        availableWidth, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                }
+
+                navigateView.setOnClickListener {
+                    AlertControlDialog.Builder()
+                        .setContext(requireContext())
+                        .setTitle("操作提示")
+                        .setMessage("确定要前往吗")
+                        .setNegativeButton("取消")
+                        .setPositiveButton("确定")
+                        .setOnDialogButtonClickListener(object :
+                            AlertControlDialog.OnDialogButtonClickListener {
+                            override fun onConfirmClick() {
+                                val latLng = marker.position
+                                val lat = latLng.latitude.toString()
+                                val lng = latLng.longitude.toString()
+                                if (lat.isBlank() || lng.isBlank()) {
+                                    "窨井经纬度异常，无法开启导航".show()
+                                    return
+                                }
+                                Poi(
+                                    marker.snippet,
+                                    LatLng(lat.toDouble(), lng.toDouble()),
+                                    ""
+                                ).showRouteOnMap(
+                                    requireContext()
+                                )
+                            }
+
+                            override fun onCancelClick() {
+
+                            }
+                        }).build().show()
+                }
                 return infoWindow
             }
         }
@@ -441,36 +523,6 @@
      * */
     override fun getInfoContents(p0: Marker?): View? = null
 
-    override fun onInfoWindowClick(p0: Marker?) {
-        if (p0 != null) {
-            AlertControlDialog.Builder()
-                .setContext(requireContext())
-                .setTitle("操作提示")
-                .setMessage("确定要前往吗")
-                .setNegativeButton("取消")
-                .setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        val latLng = p0.position
-                        val lat = latLng.latitude.toString()
-                        val lng = latLng.longitude.toString()
-                        if (lat.isBlank() || lng.isBlank()) {
-                            "窨井经纬度异常，无法开启导航".show()
-                            return
-                        }
-                        Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap(
-                            requireContext()
-                        )
-                    }
-
-                    override fun onCancelClick() {
-
-                    }
-                }).build().show()
-        }
-    }
-
     /***以下是地图生命周期管理************************************************************************/
     override fun onResume() {
         super.onResume()
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
index e8970c2..266cd18 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.sanxi.utils.retrofit
 
+import android.os.Looper
 import android.util.Log
 import com.casic.app.smartwell.sanxi.extensions.show
 import com.casic.app.smartwell.sanxi.utils.Constant
@@ -37,14 +38,19 @@
             HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
                 override fun log(@NotNull message: String) {
                     Log.d(kTag, ">>>>> $message")
-                    if (message.contains("Exception")) {
-                        "请求服务器异常，请检查网络或者服务器配置".show()
+                    if (message.contains("SocketTimeoutException")) {
+                        /**
+                         * 子线程需要自己管理Looper
+                         * */
+                        Looper.prepare()
+                        "请求服务器超时，请检查网络或者服务器配置".show()
+                        Looper.loop()
                     }
                 }
             })
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
         val builder = OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)// 连接时间：30s超时
+            .connectTimeout(15, TimeUnit.SECONDS)// 连接时间：15s超时
             .readTimeout(10, TimeUnit.SECONDS)// 读取时间：10s超时
             .writeTimeout(10, TimeUnit.SECONDS)// 写入时间：10s超时
         return builder.addInterceptor(interceptor).build()

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
index e0b3f6a..82995f2 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.extensions
 
 import android.graphics.Color
-import android.os.Looper
 import android.view.Gravity
 import android.widget.TextView
 import android.widget.Toast
@@ -30,12 +29,6 @@
 
 //将Toast扩展到String，任何线程都可以显示
 fun String.show() {
-    var toastLooper = Looper.myLooper()
-    if (toastLooper == null) {
-        Looper.prepare()
-        toastLooper = Looper.myLooper()
-    }
-
     val context = BaseApplication.obtainInstance()
     val toast = Toast(context)
     val textView = TextView(context)
@@ -53,11 +46,6 @@
     toast.view = textView
     toast.duration = Toast.LENGTH_SHORT
     toast.show()
-
-    if (toastLooper != null) {
-        Looper.loop()
-        toastLooper.quit()
-    }
 }
 
 fun String.isLetterAndDigit(): Boolean {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 87cab8c..12cdd2d 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,10 +2,12 @@
 
 import android.graphics.Point
 import android.os.Bundle
-import android.util.Log
+import android.os.CountDownTimer
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +22,7 @@
 import com.casic.app.smartwell.sanxi.model.WellListModel
 import com.casic.app.smartwell.sanxi.utils.ChartViewHelper
 import com.casic.app.smartwell.sanxi.utils.Constant
+import com.casic.app.smartwell.sanxi.utils.DialogHelper
 import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
 import com.casic.app.smartwell.sanxi.vm.DeviceViewModel
 import com.casic.app.smartwell.sanxi.vm.WellViewModel
@@ -42,7 +45,7 @@
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
 
 class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener,
-    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnInfoWindowClickListener {
+    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter {
 
     private val kTag = "HomePageFragment"
     private lateinit var homeView: View
@@ -113,6 +116,8 @@
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
 
         //获取所有窨井数据
+        httpCountDownTimer.start()
+        DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...")
         wellViewModel.obtainAllWell()
         wellViewModel.allWellModel.observe(viewLifecycleOwner, {
             if (it.code == 200) {
@@ -139,10 +144,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -150,7 +155,7 @@
                 //移动到指定经纬度
                 val cameraPosition = CameraPosition(centerLatLng, 13f, 0f, 0f)
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
-                aMap.animateCamera(cameraUpdate, 3000, null)
+                aMap.animateCamera(cameraUpdate, 1500, null)
             }
         })
 
@@ -332,8 +337,6 @@
         aMap.addOnMarkerClickListener(this)
         // 点击marker弹出自定义popup
         aMap.setInfoWindowAdapter(this)
-        //信息窗点击事件
-        aMap.addOnInfoWindowClickListener(this)
     }
 
     override fun onMapLoaded() {
@@ -345,9 +348,25 @@
 
     }
 
+    /**
+     * http请求计时器
+     * */
+    private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) {
+        override fun onFinish() {
+            "请求服务器超时，请退出后重试".show()
+            DialogHelper.dismissLoadingDialog()
+        }
+
+        override fun onTick(millisUntilFinished: Long) {
+
+        }
+    }
+
     //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(p0: CameraPosition?) {
         //地图缩放之后显示聚合点数据
+        DialogHelper.dismissLoadingDialog()
+        httpCountDownTimer.cancel()
         initClustersMarkers()
     }
 
@@ -409,15 +428,16 @@
     }
 
     override fun getInfoWindow(marker: Marker?): View? {
+        val availableWidth = (SizeUtil.getScreenWidth(requireContext()) * 0.8).toInt()
         if (infoWindow == null) {
             infoWindow = LayoutInflater.from(requireContext()).inflate(R.layout.popu_map_info, null)
         }
-        val v = infoWindow!!
         //反射得到popup里面的控件对象
-        val wellTypeView = v.findViewById<TextView>(R.id.wellTypeView)
-        val wellCodeView = v.findViewById<TextView>(R.id.wellCodeView)
-        val ownerShipView = v.findViewById<TextView>(R.id.ownerShipView)
-        val locationView = v.findViewById<TextView>(R.id.locationView)
+        val wellTypeView = infoWindow!!.findViewById<TextView>(R.id.wellTypeView)
+        val wellCodeView = infoWindow!!.findViewById<TextView>(R.id.wellCodeView)
+        val ownerShipView = infoWindow!!.findViewById<TextView>(R.id.ownerShipView)
+        val locationView = infoWindow!!.findViewById<TextView>(R.id.locationView)
+        val navigateView = infoWindow!!.findViewById<ImageView>(R.id.navigateView)
 
         //绑定数据
         val clickedLatLng = marker?.position!!
@@ -428,7 +448,69 @@
                 wellTypeView.text = String.format("井类型: ${well.wellType.toTypeName()}")
                 wellCodeView.text = String.format("井编号: ${well.wellCode}")
                 ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}")
-                locationView.text = String.format("详细位置: ${well.position}")
+                val temp = String.format("详细位置: ${well.position}")
+
+                /**
+                 * 20是xml里面设置的window的内边距
+                 * */
+                val textPaint = ownerShipView.paint
+                if (textPaint.measureText(temp) <= availableWidth) {
+                    //如果整行宽度在控件可用宽度之内，就不处理了
+                    locationView.text = temp
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                } else {
+                    //如果整行宽度超过控件可用宽度，则按字符测量，在超过可用宽度的前一个字符处手动换行
+                    val wordWidth = textPaint.measureText(temp, 0, 1)
+                    val index = (availableWidth / wordWidth).toInt()
+                    val strings = temp.split("")
+                    val newTextBuilder = StringBuilder()
+                    for (i in strings.indices) {
+                        if (i == index) {
+                            newTextBuilder.append(strings[i]).append("\n")
+                        } else {
+                            newTextBuilder.append(strings[i])
+                        }
+                    }
+                    locationView.text = newTextBuilder
+                    //动态设置infoWindow宽高
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        availableWidth, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                }
+
+                navigateView.setOnClickListener {
+                    AlertControlDialog.Builder()
+                        .setContext(requireContext())
+                        .setTitle("操作提示")
+                        .setMessage("确定要前往吗")
+                        .setNegativeButton("取消")
+                        .setPositiveButton("确定")
+                        .setOnDialogButtonClickListener(object :
+                            AlertControlDialog.OnDialogButtonClickListener {
+                            override fun onConfirmClick() {
+                                val latLng = marker.position
+                                val lat = latLng.latitude.toString()
+                                val lng = latLng.longitude.toString()
+                                if (lat.isBlank() || lng.isBlank()) {
+                                    "窨井经纬度异常，无法开启导航".show()
+                                    return
+                                }
+                                Poi(
+                                    marker.snippet,
+                                    LatLng(lat.toDouble(), lng.toDouble()),
+                                    ""
+                                ).showRouteOnMap(
+                                    requireContext()
+                                )
+                            }
+
+                            override fun onCancelClick() {
+
+                            }
+                        }).build().show()
+                }
                 return infoWindow
             }
         }
@@ -441,36 +523,6 @@
      * */
     override fun getInfoContents(p0: Marker?): View? = null
 
-    override fun onInfoWindowClick(p0: Marker?) {
-        if (p0 != null) {
-            AlertControlDialog.Builder()
-                .setContext(requireContext())
-                .setTitle("操作提示")
-                .setMessage("确定要前往吗")
-                .setNegativeButton("取消")
-                .setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        val latLng = p0.position
-                        val lat = latLng.latitude.toString()
-                        val lng = latLng.longitude.toString()
-                        if (lat.isBlank() || lng.isBlank()) {
-                            "窨井经纬度异常，无法开启导航".show()
-                            return
-                        }
-                        Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap(
-                            requireContext()
-                        )
-                    }
-
-                    override fun onCancelClick() {
-
-                    }
-                }).build().show()
-        }
-    }
-
     /***以下是地图生命周期管理************************************************************************/
     override fun onResume() {
         super.onResume()
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
index e8970c2..266cd18 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.sanxi.utils.retrofit
 
+import android.os.Looper
 import android.util.Log
 import com.casic.app.smartwell.sanxi.extensions.show
 import com.casic.app.smartwell.sanxi.utils.Constant
@@ -37,14 +38,19 @@
             HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
                 override fun log(@NotNull message: String) {
                     Log.d(kTag, ">>>>> $message")
-                    if (message.contains("Exception")) {
-                        "请求服务器异常，请检查网络或者服务器配置".show()
+                    if (message.contains("SocketTimeoutException")) {
+                        /**
+                         * 子线程需要自己管理Looper
+                         * */
+                        Looper.prepare()
+                        "请求服务器超时，请检查网络或者服务器配置".show()
+                        Looper.loop()
                     }
                 }
             })
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
         val builder = OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)// 连接时间：30s超时
+            .connectTimeout(15, TimeUnit.SECONDS)// 连接时间：15s超时
             .readTimeout(10, TimeUnit.SECONDS)// 读取时间：10s超时
             .writeTimeout(10, TimeUnit.SECONDS)// 写入时间：10s超时
         return builder.addInterceptor(interceptor).build()
diff --git a/app/src/main/res/drawable/ic_navigate.xml b/app/src/main/res/drawable/ic_navigate.xml
new file mode 100644
index 0000000..fe7e38a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate.xml
@@ -0,0 +1,87 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72px"
+    android:height="72px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M910.1,474.7c-6.6,-7.7 -15.1,-11.8 -24.1,-15.9c-16.9,-7.6 -33.8,-15.1 -50.7,-22.7c-31.7,-14.2 -63.4,-28.4 -95,-42.6c-40.8,-18.3 -81.6,-36.6 -122.4,-54.8c-44.1,-19.8 -88.2,-39.5 -132.4,-59.3c-42,-18.8 -84,-37.6 -126,-56.5c-34.3,-15.4 -68.6,-30.7 -102.9,-46.1c-21.1,-9.4 -42.1,-18.9 -63.2,-28.3c-3.8,-1.7 -7.5,-3.4 -11.3,-5.1c-12.3,-5.5 -24,-7.9 -37.5,-5.7c-20.9,3.5 -39.4,21.5 -43.4,42.3c-2.2,11.5 -1.1,22.2 2.9,33.1c1,2.9 2.1,5.7 3.1,8.6c4.8,13.3 9.7,26.6 14.5,39.9c15.6,42.6 31.1,85.3 46.7,127.9c13.4,36.7 26.8,73.3 40.1,110c1.5,4 3,8.1 4.5,12.2c-4,10.9 -7.9,21.8 -11.9,32.6c-10.6,29.1 -21.2,58.1 -31.8,87.2c-12,32.8 -23.9,65.5 -35.9,98.3c-8.5,23.3 -17,46.6 -25.5,69.9c-1.5,4 -2.9,8 -4.4,12c-9.5,26 1.3,56.8 26.7,69.2c7.3,3.5 14.7,5.5 22.7,6c0,0 0,0 0.1,0c0.8,0.1 1.6,0.1 2.4,0.1h0.1c0.7,0 1.5,0 2.2,-0.1c16.5,-1.2 33.8,-11.1 48.9,-17.8c25.1,-11.2 50.2,-22.5 75.3,-33.7c36.9,-16.5 73.7,-33 110.6,-49.6c43.1,-19.3 86.2,-38.6 129.3,-57.9c43.7,-19.6 87.4,-39.2 131.2,-58.8c38.9,-17.4 77.8,-34.8 116.6,-52.3c28.2,-12.6 56.5,-25.3 84.7,-37.9c11.9,-5.3 23.8,-10.7 35.8,-16c10.5,-4.7 18.8,-11.4 25.3,-21C929.5,521.2 925.9,493.2 910.1,474.7zM141,186.5c-0.2,0.4 -0.4,0.9 -0.6,1.5C140.3,187.8 140.6,187.1 141,186.5zM140,190.4c-0.1,0.4 -0.1,1 -0.2,1.8C139.7,192.1 139.8,191.3 140,190.4zM143.3,841.3c0.1,0.1 0.2,0.2 0.2,0.3C143.4,841.6 143.4,841.5 143.3,841.3C143.3,841.4 143.3,841.3 143.3,841.3zM143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1zM140.1,835.7c0.1,-0.3 0.7,1.9 0.8,2.2C140.3,836.9 139.9,836 140.1,835.7zM881.1,521.8c0.2,-0.3 0.5,-0.7 0.9,-1.1C882,520.9 881.5,521.3 881.1,521.8zM883.2,518.5c-0.2,0.3 -0.3,0.5 -0.5,0.7c0.4,-0.6 0.9,-1.4 1,-1.6C883.7,517.7 883.5,518 883.2,518.5zM884.7,513.5c0,1 -0.1,2.3 -0.2,0.9c-0.3,1 -0.7,2 -0.8,2.5c-0.2,0.5 -1.4,2.9 -1.1,2.5c-0.2,0.3 -0.4,0.6 -0.4,0.7c-0.3,0.4 -0.5,0.8 -0.8,1.2c-0.3,0.4 -0.5,0.6 -0.6,0.8c0.1,-0.1 0.2,-0.2 0.3,-0.3c-0.6,0.8 -0.7,0.8 -0.3,0.3c-0.3,0.3 -0.6,0.6 -0.7,0.7c-0.5,0.5 -1,1 -1.6,1.4c0,0 0,0 0.1,0c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3c0.2,-0.1 0.3,-0.3 0.5,-0.5c-5.2,3 -10.9,5.3 -16.3,7.7c-24,10.8 -48,21.5 -72,32.3c-41.7,18.7 -83.3,37.3 -125,56c-50.6,22.7 -101.1,45.3 -151.7,68c-50.1,22.5 -100.2,44.9 -150.3,67.4c-41.3,18.5 -82.6,37 -123.9,55.5c-23.2,10.4 -46.4,20.8 -69.5,31.2c-1.9,0.8 -3.7,1.7 -5.6,2.5c-0.3,0.1 -0.6,0.3 -1,0.4c-0.9,0.4 -1.9,0.8 -2.8,1.3c-0.6,0.3 -1.2,0.6 -1.8,0.9c-0.6,0.3 -1.2,0.6 -1.7,0.7c0.5,-0.3 1,-0.5 1.5,-0.7c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c-0.5,0 -1.1,0 -1.7,0.1c0.4,0 0.9,0.1 1.5,0.2c-0.1,0.2 -0.8,0 -1.5,-0.2c-0.1,0 -0.1,0 -0.2,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c-0.5,-0.1 -0.9,-0.3 -1,-0.3c-0.2,-0.1 -1.3,-0.3 -2.1,-0.6c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6c-0.5,-0.1 -0.8,-0.3 -0.8,-0.4c0.3,0.1 0.6,0.2 0.8,0.4c0.1,0 0.2,0.1 0.3,0.1c-0.4,-0.2 -0.8,-0.4 -1.2,-0.6c-0.8,-0.4 -1.5,-0.9 -2.3,-1.3c-0.1,0 -0.2,-0.1 -0.2,-0.1c0,0 0.1,0.1 0.1,0.1c3,2.9 -3.5,-1.8 -0.1,-0.1c-0.6,-0.6 -1.2,-1.1 -1.8,-1.7s-1.1,-1.2 -1.7,-1.8c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9l0.1,0.1c-0.5,-0.7 -1.2,-1.7 -1.8,-2.6c0,0 -0.1,-0.4 -0.2,-1.1c-0.3,-1.2 -0.6,-2.3 -0.9,-3.5c0,0.1 0,0.1 0,0.2c-0.1,2.8 -1.2,-4.9 -0.1,-0.6c0,0.2 0.1,0.3 0.1,0.4c0.1,-1.2 0,-2.5 0,-3.6c0,-0.2 0,-0.4 0,-0.6c-1.1,2.5 -0.2,-3.5 0,0c0.1,-0.2 0.2,-0.5 0.3,-0.8c0.3,-0.8 0.5,-1.6 0.7,-2.4c1,-2.9 2.1,-5.7 3.1,-8.6c5.2,-14.4 10.5,-28.8 15.7,-43.2c18.5,-50.3 36.9,-100.5 55.2,-150.6c11.2,-30.6 22.3,-61.1 33.5,-91.7h279.8c10.5,0 20.5,-9.2 20,-20s-8.8,-20 -20,-20H248.3c-6.1,-16.8 -12.2,-33.5 -18.3,-50.3c-18.6,-50.8 -37.1,-101.7 -55.7,-152.5c-10.6,-29 -21.2,-58.1 -31.8,-87.1c-0.6,-1.8 -1.4,-3.6 -1.9,-5.4c-0.1,-0.5 -0.3,-1 -0.4,-1.5c-0.1,-0.4 -0.1,-0.7 -0.2,-0.9c0,0.1 0,0.3 0,0.4c0,0.3 0.1,0.7 0.2,1.2c-0.1,-0.1 -0.2,-0.6 -0.2,-1.2c-0.2,-1.2 -0.2,-1.3 0,-0.4c0,-0.7 0.1,-1.4 0.1,-1.7V191c0.1,-0.6 0.1,-1 0.1,-1.2c0,0.2 -0.1,0.4 -0.2,0.6c0.1,-0.9 0.2,-1.1 0.2,-0.6c0.2,-0.7 0.4,-1.3 0.4,-1.6c0.1,-0.4 0.3,-0.9 0.4,-1.3c0.1,-0.4 0.2,-0.7 0.3,-0.9c-0.1,0.1 -0.2,0.3 -0.3,0.4c0.4,-0.9 0.5,-1.1 0.3,-0.5c0.3,-0.4 0.5,-0.7 0.6,-0.9c0.5,-0.9 1.1,-1.7 1.6,-2.6c-2.7,2.4 2.4,-3.8 0.1,-0.2c0,0.1 -0.1,0.1 -0.1,0.2c0.1,-0.1 0.1,-0.1 0.2,-0.2c0.6,-0.6 1.2,-1.3 1.8,-1.8c0.3,-0.3 0.5,-0.5 0.8,-0.8c-0.2,0.1 -0.4,0.3 -0.6,0.4c-0.1,0.1 -0.2,0.1 -0.3,0.2c0,0 0.1,-0.1 0.3,-0.2c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0.6,-0.4 1.3,-0.8 1.3,-0.8v0c0.7,-0.4 1.3,-0.8 2,-1.1c0,0 0,0 -0.1,0c-0.2,0.1 -0.5,0.2 -0.8,0.4c0,-0.1 0.3,-0.2 0.8,-0.4c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1c0.9,-0.3 2.5,-0.7 3.7,-1h0c0,0 0,0 0,0c1,-0.2 1.8,-0.4 1.9,-0.3c0.3,0.3 -1.1,0.3 -1.9,0.3c0.2,0 0.4,0 0.7,0c1.2,0.1 2.5,-0.2 3.8,0c-1.1,-0.4 -1.9,-0.8 1,0.1c-0.3,-0.1 -0.7,-0.1 -1,-0.1c0.5,0.2 1.1,0.4 1.4,0.5c1.6,0.5 4.7,1.8 0.5,-0.1c0.6,0.3 1.2,0.5 1.8,0.8c0.2,0.1 0.5,0.2 0.7,0.3c5.5,2.4 10.9,4.9 16.4,7.3c28.2,12.6 56.4,25.3 84.6,37.9c44.3,19.8 88.5,39.7 132.8,59.5c51.1,22.9 102.2,45.8 153.4,68.7c49.2,22 98.4,44.1 147.6,66.1c38.5,17.2 76.9,34.5 115.4,51.7c18.6,8.3 37.2,16.7 55.8,25c2.5,1.1 5.1,2.1 7.5,3.4c0.7,0.4 1.3,0.8 2,1.2c0.2,0.1 0.4,0.3 0.6,0.4c0.3,0.2 0.6,0.4 0.8,0.6c0,-0.1 -0.1,-0.1 -0.1,-0.1c-0.3,-0.2 -0.7,-0.5 -1.3,-0.9c0.3,0 0.8,0.4 1.3,0.9c0.3,0.2 0.5,0.4 0.6,0.4c0,0 -0.2,-0.1 -0.4,-0.3c0.7,0.7 1.4,1.6 1.7,1.9c0.2,0.2 0.4,0.4 0.6,0.5c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1c1.6,1 1.7,1.7 0.8,1.1c0.5,0.9 0.9,1.9 1.3,2.4c0.2,0.3 0.4,0.5 0.5,0.7c-0.2,-0.5 -0.3,-1 -0.5,-1.4c0.4,0.7 1.6,2.8 0.5,1.4c0.3,0.9 0.5,1.9 0.7,2.6c0.2,1 0.5,1.8 0.6,2.8c-0.1,-0.8 -0.2,-1.5 -0.3,-2.2c0.3,0.4 0.3,1.3 0.3,2.2c0,0 0,0 0,0c0,1 -0.2,2 -0.2,2.4c0,0.4 0,0.8 0,1C884.6,514 884.7,513.7 884.7,513.5c0,-0.4 0,-0.8 0,-0.9C884.8,512.8 884.8,513.1 884.7,513.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.8,829.1C138.7,831.6 139.6,825.7 139.8,829.1L139.8,829.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.7,832.9c0,0.2 0.1,0.3 0.1,0.4c0,0.1 0,0.1 0,0.2C139.7,836.3 138.6,828.6 139.7,832.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140,194.1c0,0.1 0,0.3 0,0.4C139.9,193.2 139.9,193.1 140,194.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140.2,189.8L140.2,189.8c0,0.2 -0.1,0.4 -0.2,0.6C140.2,189.5 140.2,189.3 140.2,189.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M141.3,186C141.3,186 141.3,186 141.3,186c-0.1,0.2 -0.2,0.3 -0.3,0.5C141.4,185.5 141.5,185.4 141.3,186z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M142.7,840.5c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9L142.7,840.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.6,182.3c0,0.1 -0.1,0.1 -0.1,0.2C140.8,184.9 145.8,178.7 143.6,182.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M145.8,180.1c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0,0 0,0 -0.1,0C146.1,179.9 145.9,180 145.8,180.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M146.2,844c0,0 0.1,0.1 0.1,0.1C149.3,847 142.8,842.3 146.2,844z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.7,177.8c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1C149.8,177.8 149.8,177.8 149.7,177.8C149.7,177.8 149.7,177.8 149.7,177.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.9,846c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6C149.7,846 149.8,846 149.9,846L149.9,846z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153.8,847.1L153.8,847.1c0.5,0 1,0.1 1.5,0.2C155.2,847.5 154.5,847.3 153.8,847.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153,886.9c0.8,0.1 1.6,0.1 2.4,0.1C154.6,887 153.8,887 153,886.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M154.1,847h1.4c-0.5,0 -1.1,0 -1.7,0.1c-0.1,0 -0.2,0 -0.3,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c0,0 0,0 0,0C153.3,846.9 153.6,847 154.1,847z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M155.5,887c0.7,0 1.5,0 2.2,-0.1C157,887 156.3,887 155.5,887z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M159,176.9c-0.3,-0.1 -0.7,-0.1 -1,-0.1C156.9,176.4 156.1,176 159,176.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M156.9,848c0.5,-0.3 1,-0.5 1.5,-0.7c0.1,0 0.1,0 0.2,0C158.1,847.6 157.5,847.9 156.9,848z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M160,846.5c-0.5,0.3 -1,0.5 -1.6,0.8c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c0.9,0 1.8,-0.1 2.8,-0.1C158.9,846.8 159.5,846.7 160,846.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M878.6,524.1c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3C878.2,524.5 878.3,524.3 878.6,524.1C878.5,524.2 878.5,524.2 878.6,524.1C878.6,524.1 878.6,524.1 878.6,524.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M879.3,500c0,-0.1 -0.1,-0.1 -0.1,-0.1c0.3,0.2 0.5,0.4 0.6,0.4C879.7,500.3 879.6,500.2 879.3,500C879.3,500 879.3,500 879.3,500z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M880.8,522c0.1,-0.1 0.2,-0.2 0.3,-0.3C880.5,522.5 880.4,522.6 880.8,522z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M881.6,502.4c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1C882.4,502.3 882.5,503 881.6,502.4z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,519.2c0.4,-0.6 0.9,-1.4 1,-1.6c-0.1,0.1 -0.2,0.4 -0.6,0.9C883,518.8 882.9,519 882.8,519.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,504.1c0.4,0.7 1.6,2.8 0.5,1.4C883.2,505 883.1,504.5 882.8,504.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M884.7,513.5c0,1 -0.1,2.3 -0.2,0.9C884.6,514 884.7,513.7 884.7,513.5z" />
+</vector>

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
index e0b3f6a..82995f2 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.extensions
 
 import android.graphics.Color
-import android.os.Looper
 import android.view.Gravity
 import android.widget.TextView
 import android.widget.Toast
@@ -30,12 +29,6 @@
 
 //将Toast扩展到String，任何线程都可以显示
 fun String.show() {
-    var toastLooper = Looper.myLooper()
-    if (toastLooper == null) {
-        Looper.prepare()
-        toastLooper = Looper.myLooper()
-    }
-
     val context = BaseApplication.obtainInstance()
     val toast = Toast(context)
     val textView = TextView(context)
@@ -53,11 +46,6 @@
     toast.view = textView
     toast.duration = Toast.LENGTH_SHORT
     toast.show()
-
-    if (toastLooper != null) {
-        Looper.loop()
-        toastLooper.quit()
-    }
 }
 
 fun String.isLetterAndDigit(): Boolean {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 87cab8c..12cdd2d 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,10 +2,12 @@
 
 import android.graphics.Point
 import android.os.Bundle
-import android.util.Log
+import android.os.CountDownTimer
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +22,7 @@
 import com.casic.app.smartwell.sanxi.model.WellListModel
 import com.casic.app.smartwell.sanxi.utils.ChartViewHelper
 import com.casic.app.smartwell.sanxi.utils.Constant
+import com.casic.app.smartwell.sanxi.utils.DialogHelper
 import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
 import com.casic.app.smartwell.sanxi.vm.DeviceViewModel
 import com.casic.app.smartwell.sanxi.vm.WellViewModel
@@ -42,7 +45,7 @@
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
 
 class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener,
-    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnInfoWindowClickListener {
+    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter {
 
     private val kTag = "HomePageFragment"
     private lateinit var homeView: View
@@ -113,6 +116,8 @@
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
 
         //获取所有窨井数据
+        httpCountDownTimer.start()
+        DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...")
         wellViewModel.obtainAllWell()
         wellViewModel.allWellModel.observe(viewLifecycleOwner, {
             if (it.code == 200) {
@@ -139,10 +144,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -150,7 +155,7 @@
                 //移动到指定经纬度
                 val cameraPosition = CameraPosition(centerLatLng, 13f, 0f, 0f)
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
-                aMap.animateCamera(cameraUpdate, 3000, null)
+                aMap.animateCamera(cameraUpdate, 1500, null)
             }
         })
 
@@ -332,8 +337,6 @@
         aMap.addOnMarkerClickListener(this)
         // 点击marker弹出自定义popup
         aMap.setInfoWindowAdapter(this)
-        //信息窗点击事件
-        aMap.addOnInfoWindowClickListener(this)
     }
 
     override fun onMapLoaded() {
@@ -345,9 +348,25 @@
 
     }
 
+    /**
+     * http请求计时器
+     * */
+    private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) {
+        override fun onFinish() {
+            "请求服务器超时，请退出后重试".show()
+            DialogHelper.dismissLoadingDialog()
+        }
+
+        override fun onTick(millisUntilFinished: Long) {
+
+        }
+    }
+
     //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(p0: CameraPosition?) {
         //地图缩放之后显示聚合点数据
+        DialogHelper.dismissLoadingDialog()
+        httpCountDownTimer.cancel()
         initClustersMarkers()
     }
 
@@ -409,15 +428,16 @@
     }
 
     override fun getInfoWindow(marker: Marker?): View? {
+        val availableWidth = (SizeUtil.getScreenWidth(requireContext()) * 0.8).toInt()
         if (infoWindow == null) {
             infoWindow = LayoutInflater.from(requireContext()).inflate(R.layout.popu_map_info, null)
         }
-        val v = infoWindow!!
         //反射得到popup里面的控件对象
-        val wellTypeView = v.findViewById<TextView>(R.id.wellTypeView)
-        val wellCodeView = v.findViewById<TextView>(R.id.wellCodeView)
-        val ownerShipView = v.findViewById<TextView>(R.id.ownerShipView)
-        val locationView = v.findViewById<TextView>(R.id.locationView)
+        val wellTypeView = infoWindow!!.findViewById<TextView>(R.id.wellTypeView)
+        val wellCodeView = infoWindow!!.findViewById<TextView>(R.id.wellCodeView)
+        val ownerShipView = infoWindow!!.findViewById<TextView>(R.id.ownerShipView)
+        val locationView = infoWindow!!.findViewById<TextView>(R.id.locationView)
+        val navigateView = infoWindow!!.findViewById<ImageView>(R.id.navigateView)
 
         //绑定数据
         val clickedLatLng = marker?.position!!
@@ -428,7 +448,69 @@
                 wellTypeView.text = String.format("井类型: ${well.wellType.toTypeName()}")
                 wellCodeView.text = String.format("井编号: ${well.wellCode}")
                 ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}")
-                locationView.text = String.format("详细位置: ${well.position}")
+                val temp = String.format("详细位置: ${well.position}")
+
+                /**
+                 * 20是xml里面设置的window的内边距
+                 * */
+                val textPaint = ownerShipView.paint
+                if (textPaint.measureText(temp) <= availableWidth) {
+                    //如果整行宽度在控件可用宽度之内，就不处理了
+                    locationView.text = temp
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                } else {
+                    //如果整行宽度超过控件可用宽度，则按字符测量，在超过可用宽度的前一个字符处手动换行
+                    val wordWidth = textPaint.measureText(temp, 0, 1)
+                    val index = (availableWidth / wordWidth).toInt()
+                    val strings = temp.split("")
+                    val newTextBuilder = StringBuilder()
+                    for (i in strings.indices) {
+                        if (i == index) {
+                            newTextBuilder.append(strings[i]).append("\n")
+                        } else {
+                            newTextBuilder.append(strings[i])
+                        }
+                    }
+                    locationView.text = newTextBuilder
+                    //动态设置infoWindow宽高
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        availableWidth, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                }
+
+                navigateView.setOnClickListener {
+                    AlertControlDialog.Builder()
+                        .setContext(requireContext())
+                        .setTitle("操作提示")
+                        .setMessage("确定要前往吗")
+                        .setNegativeButton("取消")
+                        .setPositiveButton("确定")
+                        .setOnDialogButtonClickListener(object :
+                            AlertControlDialog.OnDialogButtonClickListener {
+                            override fun onConfirmClick() {
+                                val latLng = marker.position
+                                val lat = latLng.latitude.toString()
+                                val lng = latLng.longitude.toString()
+                                if (lat.isBlank() || lng.isBlank()) {
+                                    "窨井经纬度异常，无法开启导航".show()
+                                    return
+                                }
+                                Poi(
+                                    marker.snippet,
+                                    LatLng(lat.toDouble(), lng.toDouble()),
+                                    ""
+                                ).showRouteOnMap(
+                                    requireContext()
+                                )
+                            }
+
+                            override fun onCancelClick() {
+
+                            }
+                        }).build().show()
+                }
                 return infoWindow
             }
         }
@@ -441,36 +523,6 @@
      * */
     override fun getInfoContents(p0: Marker?): View? = null
 
-    override fun onInfoWindowClick(p0: Marker?) {
-        if (p0 != null) {
-            AlertControlDialog.Builder()
-                .setContext(requireContext())
-                .setTitle("操作提示")
-                .setMessage("确定要前往吗")
-                .setNegativeButton("取消")
-                .setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        val latLng = p0.position
-                        val lat = latLng.latitude.toString()
-                        val lng = latLng.longitude.toString()
-                        if (lat.isBlank() || lng.isBlank()) {
-                            "窨井经纬度异常，无法开启导航".show()
-                            return
-                        }
-                        Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap(
-                            requireContext()
-                        )
-                    }
-
-                    override fun onCancelClick() {
-
-                    }
-                }).build().show()
-        }
-    }
-
     /***以下是地图生命周期管理************************************************************************/
     override fun onResume() {
         super.onResume()
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
index e8970c2..266cd18 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.sanxi.utils.retrofit
 
+import android.os.Looper
 import android.util.Log
 import com.casic.app.smartwell.sanxi.extensions.show
 import com.casic.app.smartwell.sanxi.utils.Constant
@@ -37,14 +38,19 @@
             HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
                 override fun log(@NotNull message: String) {
                     Log.d(kTag, ">>>>> $message")
-                    if (message.contains("Exception")) {
-                        "请求服务器异常，请检查网络或者服务器配置".show()
+                    if (message.contains("SocketTimeoutException")) {
+                        /**
+                         * 子线程需要自己管理Looper
+                         * */
+                        Looper.prepare()
+                        "请求服务器超时，请检查网络或者服务器配置".show()
+                        Looper.loop()
                     }
                 }
             })
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
         val builder = OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)// 连接时间：30s超时
+            .connectTimeout(15, TimeUnit.SECONDS)// 连接时间：15s超时
             .readTimeout(10, TimeUnit.SECONDS)// 读取时间：10s超时
             .writeTimeout(10, TimeUnit.SECONDS)// 写入时间：10s超时
         return builder.addInterceptor(interceptor).build()
diff --git a/app/src/main/res/drawable/ic_navigate.xml b/app/src/main/res/drawable/ic_navigate.xml
new file mode 100644
index 0000000..fe7e38a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate.xml
@@ -0,0 +1,87 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72px"
+    android:height="72px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M910.1,474.7c-6.6,-7.7 -15.1,-11.8 -24.1,-15.9c-16.9,-7.6 -33.8,-15.1 -50.7,-22.7c-31.7,-14.2 -63.4,-28.4 -95,-42.6c-40.8,-18.3 -81.6,-36.6 -122.4,-54.8c-44.1,-19.8 -88.2,-39.5 -132.4,-59.3c-42,-18.8 -84,-37.6 -126,-56.5c-34.3,-15.4 -68.6,-30.7 -102.9,-46.1c-21.1,-9.4 -42.1,-18.9 -63.2,-28.3c-3.8,-1.7 -7.5,-3.4 -11.3,-5.1c-12.3,-5.5 -24,-7.9 -37.5,-5.7c-20.9,3.5 -39.4,21.5 -43.4,42.3c-2.2,11.5 -1.1,22.2 2.9,33.1c1,2.9 2.1,5.7 3.1,8.6c4.8,13.3 9.7,26.6 14.5,39.9c15.6,42.6 31.1,85.3 46.7,127.9c13.4,36.7 26.8,73.3 40.1,110c1.5,4 3,8.1 4.5,12.2c-4,10.9 -7.9,21.8 -11.9,32.6c-10.6,29.1 -21.2,58.1 -31.8,87.2c-12,32.8 -23.9,65.5 -35.9,98.3c-8.5,23.3 -17,46.6 -25.5,69.9c-1.5,4 -2.9,8 -4.4,12c-9.5,26 1.3,56.8 26.7,69.2c7.3,3.5 14.7,5.5 22.7,6c0,0 0,0 0.1,0c0.8,0.1 1.6,0.1 2.4,0.1h0.1c0.7,0 1.5,0 2.2,-0.1c16.5,-1.2 33.8,-11.1 48.9,-17.8c25.1,-11.2 50.2,-22.5 75.3,-33.7c36.9,-16.5 73.7,-33 110.6,-49.6c43.1,-19.3 86.2,-38.6 129.3,-57.9c43.7,-19.6 87.4,-39.2 131.2,-58.8c38.9,-17.4 77.8,-34.8 116.6,-52.3c28.2,-12.6 56.5,-25.3 84.7,-37.9c11.9,-5.3 23.8,-10.7 35.8,-16c10.5,-4.7 18.8,-11.4 25.3,-21C929.5,521.2 925.9,493.2 910.1,474.7zM141,186.5c-0.2,0.4 -0.4,0.9 -0.6,1.5C140.3,187.8 140.6,187.1 141,186.5zM140,190.4c-0.1,0.4 -0.1,1 -0.2,1.8C139.7,192.1 139.8,191.3 140,190.4zM143.3,841.3c0.1,0.1 0.2,0.2 0.2,0.3C143.4,841.6 143.4,841.5 143.3,841.3C143.3,841.4 143.3,841.3 143.3,841.3zM143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1zM140.1,835.7c0.1,-0.3 0.7,1.9 0.8,2.2C140.3,836.9 139.9,836 140.1,835.7zM881.1,521.8c0.2,-0.3 0.5,-0.7 0.9,-1.1C882,520.9 881.5,521.3 881.1,521.8zM883.2,518.5c-0.2,0.3 -0.3,0.5 -0.5,0.7c0.4,-0.6 0.9,-1.4 1,-1.6C883.7,517.7 883.5,518 883.2,518.5zM884.7,513.5c0,1 -0.1,2.3 -0.2,0.9c-0.3,1 -0.7,2 -0.8,2.5c-0.2,0.5 -1.4,2.9 -1.1,2.5c-0.2,0.3 -0.4,0.6 -0.4,0.7c-0.3,0.4 -0.5,0.8 -0.8,1.2c-0.3,0.4 -0.5,0.6 -0.6,0.8c0.1,-0.1 0.2,-0.2 0.3,-0.3c-0.6,0.8 -0.7,0.8 -0.3,0.3c-0.3,0.3 -0.6,0.6 -0.7,0.7c-0.5,0.5 -1,1 -1.6,1.4c0,0 0,0 0.1,0c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3c0.2,-0.1 0.3,-0.3 0.5,-0.5c-5.2,3 -10.9,5.3 -16.3,7.7c-24,10.8 -48,21.5 -72,32.3c-41.7,18.7 -83.3,37.3 -125,56c-50.6,22.7 -101.1,45.3 -151.7,68c-50.1,22.5 -100.2,44.9 -150.3,67.4c-41.3,18.5 -82.6,37 -123.9,55.5c-23.2,10.4 -46.4,20.8 -69.5,31.2c-1.9,0.8 -3.7,1.7 -5.6,2.5c-0.3,0.1 -0.6,0.3 -1,0.4c-0.9,0.4 -1.9,0.8 -2.8,1.3c-0.6,0.3 -1.2,0.6 -1.8,0.9c-0.6,0.3 -1.2,0.6 -1.7,0.7c0.5,-0.3 1,-0.5 1.5,-0.7c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c-0.5,0 -1.1,0 -1.7,0.1c0.4,0 0.9,0.1 1.5,0.2c-0.1,0.2 -0.8,0 -1.5,-0.2c-0.1,0 -0.1,0 -0.2,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c-0.5,-0.1 -0.9,-0.3 -1,-0.3c-0.2,-0.1 -1.3,-0.3 -2.1,-0.6c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6c-0.5,-0.1 -0.8,-0.3 -0.8,-0.4c0.3,0.1 0.6,0.2 0.8,0.4c0.1,0 0.2,0.1 0.3,0.1c-0.4,-0.2 -0.8,-0.4 -1.2,-0.6c-0.8,-0.4 -1.5,-0.9 -2.3,-1.3c-0.1,0 -0.2,-0.1 -0.2,-0.1c0,0 0.1,0.1 0.1,0.1c3,2.9 -3.5,-1.8 -0.1,-0.1c-0.6,-0.6 -1.2,-1.1 -1.8,-1.7s-1.1,-1.2 -1.7,-1.8c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9l0.1,0.1c-0.5,-0.7 -1.2,-1.7 -1.8,-2.6c0,0 -0.1,-0.4 -0.2,-1.1c-0.3,-1.2 -0.6,-2.3 -0.9,-3.5c0,0.1 0,0.1 0,0.2c-0.1,2.8 -1.2,-4.9 -0.1,-0.6c0,0.2 0.1,0.3 0.1,0.4c0.1,-1.2 0,-2.5 0,-3.6c0,-0.2 0,-0.4 0,-0.6c-1.1,2.5 -0.2,-3.5 0,0c0.1,-0.2 0.2,-0.5 0.3,-0.8c0.3,-0.8 0.5,-1.6 0.7,-2.4c1,-2.9 2.1,-5.7 3.1,-8.6c5.2,-14.4 10.5,-28.8 15.7,-43.2c18.5,-50.3 36.9,-100.5 55.2,-150.6c11.2,-30.6 22.3,-61.1 33.5,-91.7h279.8c10.5,0 20.5,-9.2 20,-20s-8.8,-20 -20,-20H248.3c-6.1,-16.8 -12.2,-33.5 -18.3,-50.3c-18.6,-50.8 -37.1,-101.7 -55.7,-152.5c-10.6,-29 -21.2,-58.1 -31.8,-87.1c-0.6,-1.8 -1.4,-3.6 -1.9,-5.4c-0.1,-0.5 -0.3,-1 -0.4,-1.5c-0.1,-0.4 -0.1,-0.7 -0.2,-0.9c0,0.1 0,0.3 0,0.4c0,0.3 0.1,0.7 0.2,1.2c-0.1,-0.1 -0.2,-0.6 -0.2,-1.2c-0.2,-1.2 -0.2,-1.3 0,-0.4c0,-0.7 0.1,-1.4 0.1,-1.7V191c0.1,-0.6 0.1,-1 0.1,-1.2c0,0.2 -0.1,0.4 -0.2,0.6c0.1,-0.9 0.2,-1.1 0.2,-0.6c0.2,-0.7 0.4,-1.3 0.4,-1.6c0.1,-0.4 0.3,-0.9 0.4,-1.3c0.1,-0.4 0.2,-0.7 0.3,-0.9c-0.1,0.1 -0.2,0.3 -0.3,0.4c0.4,-0.9 0.5,-1.1 0.3,-0.5c0.3,-0.4 0.5,-0.7 0.6,-0.9c0.5,-0.9 1.1,-1.7 1.6,-2.6c-2.7,2.4 2.4,-3.8 0.1,-0.2c0,0.1 -0.1,0.1 -0.1,0.2c0.1,-0.1 0.1,-0.1 0.2,-0.2c0.6,-0.6 1.2,-1.3 1.8,-1.8c0.3,-0.3 0.5,-0.5 0.8,-0.8c-0.2,0.1 -0.4,0.3 -0.6,0.4c-0.1,0.1 -0.2,0.1 -0.3,0.2c0,0 0.1,-0.1 0.3,-0.2c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0.6,-0.4 1.3,-0.8 1.3,-0.8v0c0.7,-0.4 1.3,-0.8 2,-1.1c0,0 0,0 -0.1,0c-0.2,0.1 -0.5,0.2 -0.8,0.4c0,-0.1 0.3,-0.2 0.8,-0.4c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1c0.9,-0.3 2.5,-0.7 3.7,-1h0c0,0 0,0 0,0c1,-0.2 1.8,-0.4 1.9,-0.3c0.3,0.3 -1.1,0.3 -1.9,0.3c0.2,0 0.4,0 0.7,0c1.2,0.1 2.5,-0.2 3.8,0c-1.1,-0.4 -1.9,-0.8 1,0.1c-0.3,-0.1 -0.7,-0.1 -1,-0.1c0.5,0.2 1.1,0.4 1.4,0.5c1.6,0.5 4.7,1.8 0.5,-0.1c0.6,0.3 1.2,0.5 1.8,0.8c0.2,0.1 0.5,0.2 0.7,0.3c5.5,2.4 10.9,4.9 16.4,7.3c28.2,12.6 56.4,25.3 84.6,37.9c44.3,19.8 88.5,39.7 132.8,59.5c51.1,22.9 102.2,45.8 153.4,68.7c49.2,22 98.4,44.1 147.6,66.1c38.5,17.2 76.9,34.5 115.4,51.7c18.6,8.3 37.2,16.7 55.8,25c2.5,1.1 5.1,2.1 7.5,3.4c0.7,0.4 1.3,0.8 2,1.2c0.2,0.1 0.4,0.3 0.6,0.4c0.3,0.2 0.6,0.4 0.8,0.6c0,-0.1 -0.1,-0.1 -0.1,-0.1c-0.3,-0.2 -0.7,-0.5 -1.3,-0.9c0.3,0 0.8,0.4 1.3,0.9c0.3,0.2 0.5,0.4 0.6,0.4c0,0 -0.2,-0.1 -0.4,-0.3c0.7,0.7 1.4,1.6 1.7,1.9c0.2,0.2 0.4,0.4 0.6,0.5c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1c1.6,1 1.7,1.7 0.8,1.1c0.5,0.9 0.9,1.9 1.3,2.4c0.2,0.3 0.4,0.5 0.5,0.7c-0.2,-0.5 -0.3,-1 -0.5,-1.4c0.4,0.7 1.6,2.8 0.5,1.4c0.3,0.9 0.5,1.9 0.7,2.6c0.2,1 0.5,1.8 0.6,2.8c-0.1,-0.8 -0.2,-1.5 -0.3,-2.2c0.3,0.4 0.3,1.3 0.3,2.2c0,0 0,0 0,0c0,1 -0.2,2 -0.2,2.4c0,0.4 0,0.8 0,1C884.6,514 884.7,513.7 884.7,513.5c0,-0.4 0,-0.8 0,-0.9C884.8,512.8 884.8,513.1 884.7,513.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.8,829.1C138.7,831.6 139.6,825.7 139.8,829.1L139.8,829.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.7,832.9c0,0.2 0.1,0.3 0.1,0.4c0,0.1 0,0.1 0,0.2C139.7,836.3 138.6,828.6 139.7,832.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140,194.1c0,0.1 0,0.3 0,0.4C139.9,193.2 139.9,193.1 140,194.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140.2,189.8L140.2,189.8c0,0.2 -0.1,0.4 -0.2,0.6C140.2,189.5 140.2,189.3 140.2,189.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M141.3,186C141.3,186 141.3,186 141.3,186c-0.1,0.2 -0.2,0.3 -0.3,0.5C141.4,185.5 141.5,185.4 141.3,186z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M142.7,840.5c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9L142.7,840.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.6,182.3c0,0.1 -0.1,0.1 -0.1,0.2C140.8,184.9 145.8,178.7 143.6,182.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M145.8,180.1c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0,0 0,0 -0.1,0C146.1,179.9 145.9,180 145.8,180.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M146.2,844c0,0 0.1,0.1 0.1,0.1C149.3,847 142.8,842.3 146.2,844z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.7,177.8c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1C149.8,177.8 149.8,177.8 149.7,177.8C149.7,177.8 149.7,177.8 149.7,177.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.9,846c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6C149.7,846 149.8,846 149.9,846L149.9,846z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153.8,847.1L153.8,847.1c0.5,0 1,0.1 1.5,0.2C155.2,847.5 154.5,847.3 153.8,847.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153,886.9c0.8,0.1 1.6,0.1 2.4,0.1C154.6,887 153.8,887 153,886.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M154.1,847h1.4c-0.5,0 -1.1,0 -1.7,0.1c-0.1,0 -0.2,0 -0.3,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c0,0 0,0 0,0C153.3,846.9 153.6,847 154.1,847z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M155.5,887c0.7,0 1.5,0 2.2,-0.1C157,887 156.3,887 155.5,887z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M159,176.9c-0.3,-0.1 -0.7,-0.1 -1,-0.1C156.9,176.4 156.1,176 159,176.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M156.9,848c0.5,-0.3 1,-0.5 1.5,-0.7c0.1,0 0.1,0 0.2,0C158.1,847.6 157.5,847.9 156.9,848z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M160,846.5c-0.5,0.3 -1,0.5 -1.6,0.8c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c0.9,0 1.8,-0.1 2.8,-0.1C158.9,846.8 159.5,846.7 160,846.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M878.6,524.1c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3C878.2,524.5 878.3,524.3 878.6,524.1C878.5,524.2 878.5,524.2 878.6,524.1C878.6,524.1 878.6,524.1 878.6,524.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M879.3,500c0,-0.1 -0.1,-0.1 -0.1,-0.1c0.3,0.2 0.5,0.4 0.6,0.4C879.7,500.3 879.6,500.2 879.3,500C879.3,500 879.3,500 879.3,500z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M880.8,522c0.1,-0.1 0.2,-0.2 0.3,-0.3C880.5,522.5 880.4,522.6 880.8,522z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M881.6,502.4c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1C882.4,502.3 882.5,503 881.6,502.4z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,519.2c0.4,-0.6 0.9,-1.4 1,-1.6c-0.1,0.1 -0.2,0.4 -0.6,0.9C883,518.8 882.9,519 882.8,519.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,504.1c0.4,0.7 1.6,2.8 0.5,1.4C883.2,505 883.1,504.5 882.8,504.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M884.7,513.5c0,1 -0.1,2.3 -0.2,0.9C884.6,514 884.7,513.7 884.7,513.5z" />
+</vector>
diff --git a/app/src/main/res/layout/dialog_no_network.xml b/app/src/main/res/layout/dialog_no_network.xml
index aad7f7b..cad8b3d 100644
--- a/app/src/main/res/layout/dialog_no_network.xml
+++ b/app/src/main/res/layout/dialog_no_network.xml
@@ -41,7 +41,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="未发现网络，内容走丢了..."
             android:textColor="@color/hintTextColor"
-            android:textSize="@dimen/sp_18"
+            android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
index e0b3f6a..82995f2 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.extensions
 
 import android.graphics.Color
-import android.os.Looper
 import android.view.Gravity
 import android.widget.TextView
 import android.widget.Toast
@@ -30,12 +29,6 @@
 
 //将Toast扩展到String，任何线程都可以显示
 fun String.show() {
-    var toastLooper = Looper.myLooper()
-    if (toastLooper == null) {
-        Looper.prepare()
-        toastLooper = Looper.myLooper()
-    }
-
     val context = BaseApplication.obtainInstance()
     val toast = Toast(context)
     val textView = TextView(context)
@@ -53,11 +46,6 @@
     toast.view = textView
     toast.duration = Toast.LENGTH_SHORT
     toast.show()
-
-    if (toastLooper != null) {
-        Looper.loop()
-        toastLooper.quit()
-    }
 }
 
 fun String.isLetterAndDigit(): Boolean {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 87cab8c..12cdd2d 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,10 +2,12 @@
 
 import android.graphics.Point
 import android.os.Bundle
-import android.util.Log
+import android.os.CountDownTimer
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +22,7 @@
 import com.casic.app.smartwell.sanxi.model.WellListModel
 import com.casic.app.smartwell.sanxi.utils.ChartViewHelper
 import com.casic.app.smartwell.sanxi.utils.Constant
+import com.casic.app.smartwell.sanxi.utils.DialogHelper
 import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
 import com.casic.app.smartwell.sanxi.vm.DeviceViewModel
 import com.casic.app.smartwell.sanxi.vm.WellViewModel
@@ -42,7 +45,7 @@
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
 
 class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener,
-    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnInfoWindowClickListener {
+    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter {
 
     private val kTag = "HomePageFragment"
     private lateinit var homeView: View
@@ -113,6 +116,8 @@
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
 
         //获取所有窨井数据
+        httpCountDownTimer.start()
+        DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...")
         wellViewModel.obtainAllWell()
         wellViewModel.allWellModel.observe(viewLifecycleOwner, {
             if (it.code == 200) {
@@ -139,10 +144,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -150,7 +155,7 @@
                 //移动到指定经纬度
                 val cameraPosition = CameraPosition(centerLatLng, 13f, 0f, 0f)
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
-                aMap.animateCamera(cameraUpdate, 3000, null)
+                aMap.animateCamera(cameraUpdate, 1500, null)
             }
         })
 
@@ -332,8 +337,6 @@
         aMap.addOnMarkerClickListener(this)
         // 点击marker弹出自定义popup
         aMap.setInfoWindowAdapter(this)
-        //信息窗点击事件
-        aMap.addOnInfoWindowClickListener(this)
     }
 
     override fun onMapLoaded() {
@@ -345,9 +348,25 @@
 
     }
 
+    /**
+     * http请求计时器
+     * */
+    private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) {
+        override fun onFinish() {
+            "请求服务器超时，请退出后重试".show()
+            DialogHelper.dismissLoadingDialog()
+        }
+
+        override fun onTick(millisUntilFinished: Long) {
+
+        }
+    }
+
     //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(p0: CameraPosition?) {
         //地图缩放之后显示聚合点数据
+        DialogHelper.dismissLoadingDialog()
+        httpCountDownTimer.cancel()
         initClustersMarkers()
     }
 
@@ -409,15 +428,16 @@
     }
 
     override fun getInfoWindow(marker: Marker?): View? {
+        val availableWidth = (SizeUtil.getScreenWidth(requireContext()) * 0.8).toInt()
         if (infoWindow == null) {
             infoWindow = LayoutInflater.from(requireContext()).inflate(R.layout.popu_map_info, null)
         }
-        val v = infoWindow!!
         //反射得到popup里面的控件对象
-        val wellTypeView = v.findViewById<TextView>(R.id.wellTypeView)
-        val wellCodeView = v.findViewById<TextView>(R.id.wellCodeView)
-        val ownerShipView = v.findViewById<TextView>(R.id.ownerShipView)
-        val locationView = v.findViewById<TextView>(R.id.locationView)
+        val wellTypeView = infoWindow!!.findViewById<TextView>(R.id.wellTypeView)
+        val wellCodeView = infoWindow!!.findViewById<TextView>(R.id.wellCodeView)
+        val ownerShipView = infoWindow!!.findViewById<TextView>(R.id.ownerShipView)
+        val locationView = infoWindow!!.findViewById<TextView>(R.id.locationView)
+        val navigateView = infoWindow!!.findViewById<ImageView>(R.id.navigateView)
 
         //绑定数据
         val clickedLatLng = marker?.position!!
@@ -428,7 +448,69 @@
                 wellTypeView.text = String.format("井类型: ${well.wellType.toTypeName()}")
                 wellCodeView.text = String.format("井编号: ${well.wellCode}")
                 ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}")
-                locationView.text = String.format("详细位置: ${well.position}")
+                val temp = String.format("详细位置: ${well.position}")
+
+                /**
+                 * 20是xml里面设置的window的内边距
+                 * */
+                val textPaint = ownerShipView.paint
+                if (textPaint.measureText(temp) <= availableWidth) {
+                    //如果整行宽度在控件可用宽度之内，就不处理了
+                    locationView.text = temp
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                } else {
+                    //如果整行宽度超过控件可用宽度，则按字符测量，在超过可用宽度的前一个字符处手动换行
+                    val wordWidth = textPaint.measureText(temp, 0, 1)
+                    val index = (availableWidth / wordWidth).toInt()
+                    val strings = temp.split("")
+                    val newTextBuilder = StringBuilder()
+                    for (i in strings.indices) {
+                        if (i == index) {
+                            newTextBuilder.append(strings[i]).append("\n")
+                        } else {
+                            newTextBuilder.append(strings[i])
+                        }
+                    }
+                    locationView.text = newTextBuilder
+                    //动态设置infoWindow宽高
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        availableWidth, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                }
+
+                navigateView.setOnClickListener {
+                    AlertControlDialog.Builder()
+                        .setContext(requireContext())
+                        .setTitle("操作提示")
+                        .setMessage("确定要前往吗")
+                        .setNegativeButton("取消")
+                        .setPositiveButton("确定")
+                        .setOnDialogButtonClickListener(object :
+                            AlertControlDialog.OnDialogButtonClickListener {
+                            override fun onConfirmClick() {
+                                val latLng = marker.position
+                                val lat = latLng.latitude.toString()
+                                val lng = latLng.longitude.toString()
+                                if (lat.isBlank() || lng.isBlank()) {
+                                    "窨井经纬度异常，无法开启导航".show()
+                                    return
+                                }
+                                Poi(
+                                    marker.snippet,
+                                    LatLng(lat.toDouble(), lng.toDouble()),
+                                    ""
+                                ).showRouteOnMap(
+                                    requireContext()
+                                )
+                            }
+
+                            override fun onCancelClick() {
+
+                            }
+                        }).build().show()
+                }
                 return infoWindow
             }
         }
@@ -441,36 +523,6 @@
      * */
     override fun getInfoContents(p0: Marker?): View? = null
 
-    override fun onInfoWindowClick(p0: Marker?) {
-        if (p0 != null) {
-            AlertControlDialog.Builder()
-                .setContext(requireContext())
-                .setTitle("操作提示")
-                .setMessage("确定要前往吗")
-                .setNegativeButton("取消")
-                .setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        val latLng = p0.position
-                        val lat = latLng.latitude.toString()
-                        val lng = latLng.longitude.toString()
-                        if (lat.isBlank() || lng.isBlank()) {
-                            "窨井经纬度异常，无法开启导航".show()
-                            return
-                        }
-                        Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap(
-                            requireContext()
-                        )
-                    }
-
-                    override fun onCancelClick() {
-
-                    }
-                }).build().show()
-        }
-    }
-
     /***以下是地图生命周期管理************************************************************************/
     override fun onResume() {
         super.onResume()
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
index e8970c2..266cd18 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.sanxi.utils.retrofit
 
+import android.os.Looper
 import android.util.Log
 import com.casic.app.smartwell.sanxi.extensions.show
 import com.casic.app.smartwell.sanxi.utils.Constant
@@ -37,14 +38,19 @@
             HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
                 override fun log(@NotNull message: String) {
                     Log.d(kTag, ">>>>> $message")
-                    if (message.contains("Exception")) {
-                        "请求服务器异常，请检查网络或者服务器配置".show()
+                    if (message.contains("SocketTimeoutException")) {
+                        /**
+                         * 子线程需要自己管理Looper
+                         * */
+                        Looper.prepare()
+                        "请求服务器超时，请检查网络或者服务器配置".show()
+                        Looper.loop()
                     }
                 }
             })
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
         val builder = OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)// 连接时间：30s超时
+            .connectTimeout(15, TimeUnit.SECONDS)// 连接时间：15s超时
             .readTimeout(10, TimeUnit.SECONDS)// 读取时间：10s超时
             .writeTimeout(10, TimeUnit.SECONDS)// 写入时间：10s超时
         return builder.addInterceptor(interceptor).build()
diff --git a/app/src/main/res/drawable/ic_navigate.xml b/app/src/main/res/drawable/ic_navigate.xml
new file mode 100644
index 0000000..fe7e38a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate.xml
@@ -0,0 +1,87 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72px"
+    android:height="72px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M910.1,474.7c-6.6,-7.7 -15.1,-11.8 -24.1,-15.9c-16.9,-7.6 -33.8,-15.1 -50.7,-22.7c-31.7,-14.2 -63.4,-28.4 -95,-42.6c-40.8,-18.3 -81.6,-36.6 -122.4,-54.8c-44.1,-19.8 -88.2,-39.5 -132.4,-59.3c-42,-18.8 -84,-37.6 -126,-56.5c-34.3,-15.4 -68.6,-30.7 -102.9,-46.1c-21.1,-9.4 -42.1,-18.9 -63.2,-28.3c-3.8,-1.7 -7.5,-3.4 -11.3,-5.1c-12.3,-5.5 -24,-7.9 -37.5,-5.7c-20.9,3.5 -39.4,21.5 -43.4,42.3c-2.2,11.5 -1.1,22.2 2.9,33.1c1,2.9 2.1,5.7 3.1,8.6c4.8,13.3 9.7,26.6 14.5,39.9c15.6,42.6 31.1,85.3 46.7,127.9c13.4,36.7 26.8,73.3 40.1,110c1.5,4 3,8.1 4.5,12.2c-4,10.9 -7.9,21.8 -11.9,32.6c-10.6,29.1 -21.2,58.1 -31.8,87.2c-12,32.8 -23.9,65.5 -35.9,98.3c-8.5,23.3 -17,46.6 -25.5,69.9c-1.5,4 -2.9,8 -4.4,12c-9.5,26 1.3,56.8 26.7,69.2c7.3,3.5 14.7,5.5 22.7,6c0,0 0,0 0.1,0c0.8,0.1 1.6,0.1 2.4,0.1h0.1c0.7,0 1.5,0 2.2,-0.1c16.5,-1.2 33.8,-11.1 48.9,-17.8c25.1,-11.2 50.2,-22.5 75.3,-33.7c36.9,-16.5 73.7,-33 110.6,-49.6c43.1,-19.3 86.2,-38.6 129.3,-57.9c43.7,-19.6 87.4,-39.2 131.2,-58.8c38.9,-17.4 77.8,-34.8 116.6,-52.3c28.2,-12.6 56.5,-25.3 84.7,-37.9c11.9,-5.3 23.8,-10.7 35.8,-16c10.5,-4.7 18.8,-11.4 25.3,-21C929.5,521.2 925.9,493.2 910.1,474.7zM141,186.5c-0.2,0.4 -0.4,0.9 -0.6,1.5C140.3,187.8 140.6,187.1 141,186.5zM140,190.4c-0.1,0.4 -0.1,1 -0.2,1.8C139.7,192.1 139.8,191.3 140,190.4zM143.3,841.3c0.1,0.1 0.2,0.2 0.2,0.3C143.4,841.6 143.4,841.5 143.3,841.3C143.3,841.4 143.3,841.3 143.3,841.3zM143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1zM140.1,835.7c0.1,-0.3 0.7,1.9 0.8,2.2C140.3,836.9 139.9,836 140.1,835.7zM881.1,521.8c0.2,-0.3 0.5,-0.7 0.9,-1.1C882,520.9 881.5,521.3 881.1,521.8zM883.2,518.5c-0.2,0.3 -0.3,0.5 -0.5,0.7c0.4,-0.6 0.9,-1.4 1,-1.6C883.7,517.7 883.5,518 883.2,518.5zM884.7,513.5c0,1 -0.1,2.3 -0.2,0.9c-0.3,1 -0.7,2 -0.8,2.5c-0.2,0.5 -1.4,2.9 -1.1,2.5c-0.2,0.3 -0.4,0.6 -0.4,0.7c-0.3,0.4 -0.5,0.8 -0.8,1.2c-0.3,0.4 -0.5,0.6 -0.6,0.8c0.1,-0.1 0.2,-0.2 0.3,-0.3c-0.6,0.8 -0.7,0.8 -0.3,0.3c-0.3,0.3 -0.6,0.6 -0.7,0.7c-0.5,0.5 -1,1 -1.6,1.4c0,0 0,0 0.1,0c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3c0.2,-0.1 0.3,-0.3 0.5,-0.5c-5.2,3 -10.9,5.3 -16.3,7.7c-24,10.8 -48,21.5 -72,32.3c-41.7,18.7 -83.3,37.3 -125,56c-50.6,22.7 -101.1,45.3 -151.7,68c-50.1,22.5 -100.2,44.9 -150.3,67.4c-41.3,18.5 -82.6,37 -123.9,55.5c-23.2,10.4 -46.4,20.8 -69.5,31.2c-1.9,0.8 -3.7,1.7 -5.6,2.5c-0.3,0.1 -0.6,0.3 -1,0.4c-0.9,0.4 -1.9,0.8 -2.8,1.3c-0.6,0.3 -1.2,0.6 -1.8,0.9c-0.6,0.3 -1.2,0.6 -1.7,0.7c0.5,-0.3 1,-0.5 1.5,-0.7c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c-0.5,0 -1.1,0 -1.7,0.1c0.4,0 0.9,0.1 1.5,0.2c-0.1,0.2 -0.8,0 -1.5,-0.2c-0.1,0 -0.1,0 -0.2,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c-0.5,-0.1 -0.9,-0.3 -1,-0.3c-0.2,-0.1 -1.3,-0.3 -2.1,-0.6c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6c-0.5,-0.1 -0.8,-0.3 -0.8,-0.4c0.3,0.1 0.6,0.2 0.8,0.4c0.1,0 0.2,0.1 0.3,0.1c-0.4,-0.2 -0.8,-0.4 -1.2,-0.6c-0.8,-0.4 -1.5,-0.9 -2.3,-1.3c-0.1,0 -0.2,-0.1 -0.2,-0.1c0,0 0.1,0.1 0.1,0.1c3,2.9 -3.5,-1.8 -0.1,-0.1c-0.6,-0.6 -1.2,-1.1 -1.8,-1.7s-1.1,-1.2 -1.7,-1.8c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9l0.1,0.1c-0.5,-0.7 -1.2,-1.7 -1.8,-2.6c0,0 -0.1,-0.4 -0.2,-1.1c-0.3,-1.2 -0.6,-2.3 -0.9,-3.5c0,0.1 0,0.1 0,0.2c-0.1,2.8 -1.2,-4.9 -0.1,-0.6c0,0.2 0.1,0.3 0.1,0.4c0.1,-1.2 0,-2.5 0,-3.6c0,-0.2 0,-0.4 0,-0.6c-1.1,2.5 -0.2,-3.5 0,0c0.1,-0.2 0.2,-0.5 0.3,-0.8c0.3,-0.8 0.5,-1.6 0.7,-2.4c1,-2.9 2.1,-5.7 3.1,-8.6c5.2,-14.4 10.5,-28.8 15.7,-43.2c18.5,-50.3 36.9,-100.5 55.2,-150.6c11.2,-30.6 22.3,-61.1 33.5,-91.7h279.8c10.5,0 20.5,-9.2 20,-20s-8.8,-20 -20,-20H248.3c-6.1,-16.8 -12.2,-33.5 -18.3,-50.3c-18.6,-50.8 -37.1,-101.7 -55.7,-152.5c-10.6,-29 -21.2,-58.1 -31.8,-87.1c-0.6,-1.8 -1.4,-3.6 -1.9,-5.4c-0.1,-0.5 -0.3,-1 -0.4,-1.5c-0.1,-0.4 -0.1,-0.7 -0.2,-0.9c0,0.1 0,0.3 0,0.4c0,0.3 0.1,0.7 0.2,1.2c-0.1,-0.1 -0.2,-0.6 -0.2,-1.2c-0.2,-1.2 -0.2,-1.3 0,-0.4c0,-0.7 0.1,-1.4 0.1,-1.7V191c0.1,-0.6 0.1,-1 0.1,-1.2c0,0.2 -0.1,0.4 -0.2,0.6c0.1,-0.9 0.2,-1.1 0.2,-0.6c0.2,-0.7 0.4,-1.3 0.4,-1.6c0.1,-0.4 0.3,-0.9 0.4,-1.3c0.1,-0.4 0.2,-0.7 0.3,-0.9c-0.1,0.1 -0.2,0.3 -0.3,0.4c0.4,-0.9 0.5,-1.1 0.3,-0.5c0.3,-0.4 0.5,-0.7 0.6,-0.9c0.5,-0.9 1.1,-1.7 1.6,-2.6c-2.7,2.4 2.4,-3.8 0.1,-0.2c0,0.1 -0.1,0.1 -0.1,0.2c0.1,-0.1 0.1,-0.1 0.2,-0.2c0.6,-0.6 1.2,-1.3 1.8,-1.8c0.3,-0.3 0.5,-0.5 0.8,-0.8c-0.2,0.1 -0.4,0.3 -0.6,0.4c-0.1,0.1 -0.2,0.1 -0.3,0.2c0,0 0.1,-0.1 0.3,-0.2c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0.6,-0.4 1.3,-0.8 1.3,-0.8v0c0.7,-0.4 1.3,-0.8 2,-1.1c0,0 0,0 -0.1,0c-0.2,0.1 -0.5,0.2 -0.8,0.4c0,-0.1 0.3,-0.2 0.8,-0.4c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1c0.9,-0.3 2.5,-0.7 3.7,-1h0c0,0 0,0 0,0c1,-0.2 1.8,-0.4 1.9,-0.3c0.3,0.3 -1.1,0.3 -1.9,0.3c0.2,0 0.4,0 0.7,0c1.2,0.1 2.5,-0.2 3.8,0c-1.1,-0.4 -1.9,-0.8 1,0.1c-0.3,-0.1 -0.7,-0.1 -1,-0.1c0.5,0.2 1.1,0.4 1.4,0.5c1.6,0.5 4.7,1.8 0.5,-0.1c0.6,0.3 1.2,0.5 1.8,0.8c0.2,0.1 0.5,0.2 0.7,0.3c5.5,2.4 10.9,4.9 16.4,7.3c28.2,12.6 56.4,25.3 84.6,37.9c44.3,19.8 88.5,39.7 132.8,59.5c51.1,22.9 102.2,45.8 153.4,68.7c49.2,22 98.4,44.1 147.6,66.1c38.5,17.2 76.9,34.5 115.4,51.7c18.6,8.3 37.2,16.7 55.8,25c2.5,1.1 5.1,2.1 7.5,3.4c0.7,0.4 1.3,0.8 2,1.2c0.2,0.1 0.4,0.3 0.6,0.4c0.3,0.2 0.6,0.4 0.8,0.6c0,-0.1 -0.1,-0.1 -0.1,-0.1c-0.3,-0.2 -0.7,-0.5 -1.3,-0.9c0.3,0 0.8,0.4 1.3,0.9c0.3,0.2 0.5,0.4 0.6,0.4c0,0 -0.2,-0.1 -0.4,-0.3c0.7,0.7 1.4,1.6 1.7,1.9c0.2,0.2 0.4,0.4 0.6,0.5c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1c1.6,1 1.7,1.7 0.8,1.1c0.5,0.9 0.9,1.9 1.3,2.4c0.2,0.3 0.4,0.5 0.5,0.7c-0.2,-0.5 -0.3,-1 -0.5,-1.4c0.4,0.7 1.6,2.8 0.5,1.4c0.3,0.9 0.5,1.9 0.7,2.6c0.2,1 0.5,1.8 0.6,2.8c-0.1,-0.8 -0.2,-1.5 -0.3,-2.2c0.3,0.4 0.3,1.3 0.3,2.2c0,0 0,0 0,0c0,1 -0.2,2 -0.2,2.4c0,0.4 0,0.8 0,1C884.6,514 884.7,513.7 884.7,513.5c0,-0.4 0,-0.8 0,-0.9C884.8,512.8 884.8,513.1 884.7,513.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.8,829.1C138.7,831.6 139.6,825.7 139.8,829.1L139.8,829.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.7,832.9c0,0.2 0.1,0.3 0.1,0.4c0,0.1 0,0.1 0,0.2C139.7,836.3 138.6,828.6 139.7,832.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140,194.1c0,0.1 0,0.3 0,0.4C139.9,193.2 139.9,193.1 140,194.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140.2,189.8L140.2,189.8c0,0.2 -0.1,0.4 -0.2,0.6C140.2,189.5 140.2,189.3 140.2,189.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M141.3,186C141.3,186 141.3,186 141.3,186c-0.1,0.2 -0.2,0.3 -0.3,0.5C141.4,185.5 141.5,185.4 141.3,186z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M142.7,840.5c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9L142.7,840.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.6,182.3c0,0.1 -0.1,0.1 -0.1,0.2C140.8,184.9 145.8,178.7 143.6,182.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M145.8,180.1c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0,0 0,0 -0.1,0C146.1,179.9 145.9,180 145.8,180.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M146.2,844c0,0 0.1,0.1 0.1,0.1C149.3,847 142.8,842.3 146.2,844z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.7,177.8c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1C149.8,177.8 149.8,177.8 149.7,177.8C149.7,177.8 149.7,177.8 149.7,177.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.9,846c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6C149.7,846 149.8,846 149.9,846L149.9,846z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153.8,847.1L153.8,847.1c0.5,0 1,0.1 1.5,0.2C155.2,847.5 154.5,847.3 153.8,847.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153,886.9c0.8,0.1 1.6,0.1 2.4,0.1C154.6,887 153.8,887 153,886.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M154.1,847h1.4c-0.5,0 -1.1,0 -1.7,0.1c-0.1,0 -0.2,0 -0.3,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c0,0 0,0 0,0C153.3,846.9 153.6,847 154.1,847z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M155.5,887c0.7,0 1.5,0 2.2,-0.1C157,887 156.3,887 155.5,887z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M159,176.9c-0.3,-0.1 -0.7,-0.1 -1,-0.1C156.9,176.4 156.1,176 159,176.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M156.9,848c0.5,-0.3 1,-0.5 1.5,-0.7c0.1,0 0.1,0 0.2,0C158.1,847.6 157.5,847.9 156.9,848z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M160,846.5c-0.5,0.3 -1,0.5 -1.6,0.8c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c0.9,0 1.8,-0.1 2.8,-0.1C158.9,846.8 159.5,846.7 160,846.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M878.6,524.1c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3C878.2,524.5 878.3,524.3 878.6,524.1C878.5,524.2 878.5,524.2 878.6,524.1C878.6,524.1 878.6,524.1 878.6,524.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M879.3,500c0,-0.1 -0.1,-0.1 -0.1,-0.1c0.3,0.2 0.5,0.4 0.6,0.4C879.7,500.3 879.6,500.2 879.3,500C879.3,500 879.3,500 879.3,500z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M880.8,522c0.1,-0.1 0.2,-0.2 0.3,-0.3C880.5,522.5 880.4,522.6 880.8,522z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M881.6,502.4c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1C882.4,502.3 882.5,503 881.6,502.4z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,519.2c0.4,-0.6 0.9,-1.4 1,-1.6c-0.1,0.1 -0.2,0.4 -0.6,0.9C883,518.8 882.9,519 882.8,519.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,504.1c0.4,0.7 1.6,2.8 0.5,1.4C883.2,505 883.1,504.5 882.8,504.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M884.7,513.5c0,1 -0.1,2.3 -0.2,0.9C884.6,514 884.7,513.7 884.7,513.5z" />
+</vector>
diff --git a/app/src/main/res/layout/dialog_no_network.xml b/app/src/main/res/layout/dialog_no_network.xml
index aad7f7b..cad8b3d 100644
--- a/app/src/main/res/layout/dialog_no_network.xml
+++ b/app/src/main/res/layout/dialog_no_network.xml
@@ -41,7 +41,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="未发现网络，内容走丢了..."
             android:textColor="@color/hintTextColor"
-            android:textSize="@dimen/sp_18"
+            android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index 7755ff3..6b92ae1 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -1,15 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_solid_layout_black_transparent_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
-    <TextView
-        android:id="@+id/wellTypeView"
-        style="@style/MapPopupWindowTextStyle"
-        android:text="@string/unknown" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellTypeView"
+            style="@style/MapPopupWindowTextStyle"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@id/navigateView"
+            android:text="@string/unknown" />
+
+        <ImageView
+            android:id="@+id/navigateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_navigate" />
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/wellCodeView"

diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
index 15accc4..3a098be 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/base/BaseActivity.kt
@@ -6,6 +6,7 @@
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.provider.Settings
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.casic.app.smartwell.sanxi.R
 import com.casic.app.smartwell.sanxi.extensions.convertColor
@@ -43,14 +44,21 @@
             .addAction(ConnectivityManager.CONNECTIVITY_ACTION, object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
                     if (!context!!.isNetworkConnected()) {
-                        NoNetworkDialog.Builder()
-                            .setContext(this@BaseActivity)
-                            .setOnDialogButtonClickListener(object :
-                                NoNetworkDialog.OnDialogButtonClickListener {
-                                override fun onButtonClick() {
-                                    startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
-                                }
-                            }).build().show()
+                        /**
+                         * 捕获用户在有网情况下登录进入APP，后来又处于断网状态会导致闪退的Bug
+                         * */
+                        try {
+                            NoNetworkDialog.Builder()
+                                .setContext(this@BaseActivity)
+                                .setOnDialogButtonClickListener(object :
+                                    NoNetworkDialog.OnDialogButtonClickListener {
+                                    override fun onButtonClick() {
+                                        startActivity(Intent(Settings.ACTION_DATA_ROAMING_SETTINGS))
+                                    }
+                                }).build().show()
+                        } catch (e: WindowManager.BadTokenException) {
+                            e.printStackTrace()
+                        }
                     }
                 }
             })
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
index e0b3f6a..82995f2 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt
@@ -1,7 +1,6 @@
 package com.casic.app.smartwell.sanxi.extensions
 
 import android.graphics.Color
-import android.os.Looper
 import android.view.Gravity
 import android.widget.TextView
 import android.widget.Toast
@@ -30,12 +29,6 @@
 
 //将Toast扩展到String，任何线程都可以显示
 fun String.show() {
-    var toastLooper = Looper.myLooper()
-    if (toastLooper == null) {
-        Looper.prepare()
-        toastLooper = Looper.myLooper()
-    }
-
     val context = BaseApplication.obtainInstance()
     val toast = Toast(context)
     val textView = TextView(context)
@@ -53,11 +46,6 @@
     toast.view = textView
     toast.duration = Toast.LENGTH_SHORT
     toast.show()
-
-    if (toastLooper != null) {
-        Looper.loop()
-        toastLooper.quit()
-    }
 }
 
 fun String.isLetterAndDigit(): Boolean {
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
index 87cab8c..12cdd2d 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt
@@ -2,10 +2,12 @@
 
 import android.graphics.Point
 import android.os.Bundle
-import android.util.Log
+import android.os.CountDownTimer
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -20,6 +22,7 @@
 import com.casic.app.smartwell.sanxi.model.WellListModel
 import com.casic.app.smartwell.sanxi.utils.ChartViewHelper
 import com.casic.app.smartwell.sanxi.utils.Constant
+import com.casic.app.smartwell.sanxi.utils.DialogHelper
 import com.casic.app.smartwell.sanxi.vm.AlarmViewModel
 import com.casic.app.smartwell.sanxi.vm.DeviceViewModel
 import com.casic.app.smartwell.sanxi.vm.WellViewModel
@@ -42,7 +45,7 @@
 import kotlinx.android.synthetic.main.include_home_well_type_chart.*
 
 class HomePageFragment : Fragment(), AMap.OnMapLoadedListener, AMap.OnCameraChangeListener,
-    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter, AMap.OnInfoWindowClickListener {
+    AMap.OnMarkerClickListener, AMap.InfoWindowAdapter {
 
     private val kTag = "HomePageFragment"
     private lateinit var homeView: View
@@ -113,6 +116,8 @@
         workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java)
 
         //获取所有窨井数据
+        httpCountDownTimer.start()
+        DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...")
         wellViewModel.obtainAllWell()
         wellViewModel.allWellModel.observe(viewLifecycleOwner, {
             if (it.code == 200) {
@@ -139,10 +144,10 @@
                                     .snippet(well.wellName)
                             )
                         } else {
-                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
+//                            Log.d(kTag, "${well.wellCode}闸井经纬度不在国内，异常经纬度 ===> [${lng},${lat}]")
                         }
                     } else {
-                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
+//                        Log.d(kTag, "${well.wellCode}闸井经纬度异常，异常经纬度 ===> [${lng},${lat}]")
                     }
                 }
                 //计算所有点的中心点位置
@@ -150,7 +155,7 @@
                 //移动到指定经纬度
                 val cameraPosition = CameraPosition(centerLatLng, 13f, 0f, 0f)
                 val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition)
-                aMap.animateCamera(cameraUpdate, 3000, null)
+                aMap.animateCamera(cameraUpdate, 1500, null)
             }
         })
 
@@ -332,8 +337,6 @@
         aMap.addOnMarkerClickListener(this)
         // 点击marker弹出自定义popup
         aMap.setInfoWindowAdapter(this)
-        //信息窗点击事件
-        aMap.addOnInfoWindowClickListener(this)
     }
 
     override fun onMapLoaded() {
@@ -345,9 +348,25 @@
 
     }
 
+    /**
+     * http请求计时器
+     * */
+    private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) {
+        override fun onFinish() {
+            "请求服务器超时，请退出后重试".show()
+            DialogHelper.dismissLoadingDialog()
+        }
+
+        override fun onTick(millisUntilFinished: Long) {
+
+        }
+    }
+
     //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(p0: CameraPosition?) {
         //地图缩放之后显示聚合点数据
+        DialogHelper.dismissLoadingDialog()
+        httpCountDownTimer.cancel()
         initClustersMarkers()
     }
 
@@ -409,15 +428,16 @@
     }
 
     override fun getInfoWindow(marker: Marker?): View? {
+        val availableWidth = (SizeUtil.getScreenWidth(requireContext()) * 0.8).toInt()
         if (infoWindow == null) {
             infoWindow = LayoutInflater.from(requireContext()).inflate(R.layout.popu_map_info, null)
         }
-        val v = infoWindow!!
         //反射得到popup里面的控件对象
-        val wellTypeView = v.findViewById<TextView>(R.id.wellTypeView)
-        val wellCodeView = v.findViewById<TextView>(R.id.wellCodeView)
-        val ownerShipView = v.findViewById<TextView>(R.id.ownerShipView)
-        val locationView = v.findViewById<TextView>(R.id.locationView)
+        val wellTypeView = infoWindow!!.findViewById<TextView>(R.id.wellTypeView)
+        val wellCodeView = infoWindow!!.findViewById<TextView>(R.id.wellCodeView)
+        val ownerShipView = infoWindow!!.findViewById<TextView>(R.id.ownerShipView)
+        val locationView = infoWindow!!.findViewById<TextView>(R.id.locationView)
+        val navigateView = infoWindow!!.findViewById<ImageView>(R.id.navigateView)
 
         //绑定数据
         val clickedLatLng = marker?.position!!
@@ -428,7 +448,69 @@
                 wellTypeView.text = String.format("井类型: ${well.wellType.toTypeName()}")
                 wellCodeView.text = String.format("井编号: ${well.wellCode}")
                 ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}")
-                locationView.text = String.format("详细位置: ${well.position}")
+                val temp = String.format("详细位置: ${well.position}")
+
+                /**
+                 * 20是xml里面设置的window的内边距
+                 * */
+                val textPaint = ownerShipView.paint
+                if (textPaint.measureText(temp) <= availableWidth) {
+                    //如果整行宽度在控件可用宽度之内，就不处理了
+                    locationView.text = temp
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                } else {
+                    //如果整行宽度超过控件可用宽度，则按字符测量，在超过可用宽度的前一个字符处手动换行
+                    val wordWidth = textPaint.measureText(temp, 0, 1)
+                    val index = (availableWidth / wordWidth).toInt()
+                    val strings = temp.split("")
+                    val newTextBuilder = StringBuilder()
+                    for (i in strings.indices) {
+                        if (i == index) {
+                            newTextBuilder.append(strings[i]).append("\n")
+                        } else {
+                            newTextBuilder.append(strings[i])
+                        }
+                    }
+                    locationView.text = newTextBuilder
+                    //动态设置infoWindow宽高
+                    infoWindow!!.layoutParams = LinearLayout.LayoutParams(
+                        availableWidth, ViewGroup.LayoutParams.WRAP_CONTENT
+                    )
+                }
+
+                navigateView.setOnClickListener {
+                    AlertControlDialog.Builder()
+                        .setContext(requireContext())
+                        .setTitle("操作提示")
+                        .setMessage("确定要前往吗")
+                        .setNegativeButton("取消")
+                        .setPositiveButton("确定")
+                        .setOnDialogButtonClickListener(object :
+                            AlertControlDialog.OnDialogButtonClickListener {
+                            override fun onConfirmClick() {
+                                val latLng = marker.position
+                                val lat = latLng.latitude.toString()
+                                val lng = latLng.longitude.toString()
+                                if (lat.isBlank() || lng.isBlank()) {
+                                    "窨井经纬度异常，无法开启导航".show()
+                                    return
+                                }
+                                Poi(
+                                    marker.snippet,
+                                    LatLng(lat.toDouble(), lng.toDouble()),
+                                    ""
+                                ).showRouteOnMap(
+                                    requireContext()
+                                )
+                            }
+
+                            override fun onCancelClick() {
+
+                            }
+                        }).build().show()
+                }
                 return infoWindow
             }
         }
@@ -441,36 +523,6 @@
      * */
     override fun getInfoContents(p0: Marker?): View? = null
 
-    override fun onInfoWindowClick(p0: Marker?) {
-        if (p0 != null) {
-            AlertControlDialog.Builder()
-                .setContext(requireContext())
-                .setTitle("操作提示")
-                .setMessage("确定要前往吗")
-                .setNegativeButton("取消")
-                .setPositiveButton("确定")
-                .setOnDialogButtonClickListener(object :
-                    AlertControlDialog.OnDialogButtonClickListener {
-                    override fun onConfirmClick() {
-                        val latLng = p0.position
-                        val lat = latLng.latitude.toString()
-                        val lng = latLng.longitude.toString()
-                        if (lat.isBlank() || lng.isBlank()) {
-                            "窨井经纬度异常，无法开启导航".show()
-                            return
-                        }
-                        Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap(
-                            requireContext()
-                        )
-                    }
-
-                    override fun onCancelClick() {
-
-                    }
-                }).build().show()
-        }
-    }
-
     /***以下是地图生命周期管理************************************************************************/
     override fun onResume() {
         super.onResume()
diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
index e8970c2..266cd18 100644
--- a/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
+++ b/app/src/main/java/com/casic/app/smartwell/sanxi/utils/retrofit/RetrofitFactory.kt
@@ -1,5 +1,6 @@
 package com.casic.app.smartwell.sanxi.utils.retrofit
 
+import android.os.Looper
 import android.util.Log
 import com.casic.app.smartwell.sanxi.extensions.show
 import com.casic.app.smartwell.sanxi.utils.Constant
@@ -37,14 +38,19 @@
             HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
                 override fun log(@NotNull message: String) {
                     Log.d(kTag, ">>>>> $message")
-                    if (message.contains("Exception")) {
-                        "请求服务器异常，请检查网络或者服务器配置".show()
+                    if (message.contains("SocketTimeoutException")) {
+                        /**
+                         * 子线程需要自己管理Looper
+                         * */
+                        Looper.prepare()
+                        "请求服务器超时，请检查网络或者服务器配置".show()
+                        Looper.loop()
                     }
                 }
             })
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
         val builder = OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)// 连接时间：30s超时
+            .connectTimeout(15, TimeUnit.SECONDS)// 连接时间：15s超时
             .readTimeout(10, TimeUnit.SECONDS)// 读取时间：10s超时
             .writeTimeout(10, TimeUnit.SECONDS)// 写入时间：10s超时
         return builder.addInterceptor(interceptor).build()
diff --git a/app/src/main/res/drawable/ic_navigate.xml b/app/src/main/res/drawable/ic_navigate.xml
new file mode 100644
index 0000000..fe7e38a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate.xml
@@ -0,0 +1,87 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72px"
+    android:height="72px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M910.1,474.7c-6.6,-7.7 -15.1,-11.8 -24.1,-15.9c-16.9,-7.6 -33.8,-15.1 -50.7,-22.7c-31.7,-14.2 -63.4,-28.4 -95,-42.6c-40.8,-18.3 -81.6,-36.6 -122.4,-54.8c-44.1,-19.8 -88.2,-39.5 -132.4,-59.3c-42,-18.8 -84,-37.6 -126,-56.5c-34.3,-15.4 -68.6,-30.7 -102.9,-46.1c-21.1,-9.4 -42.1,-18.9 -63.2,-28.3c-3.8,-1.7 -7.5,-3.4 -11.3,-5.1c-12.3,-5.5 -24,-7.9 -37.5,-5.7c-20.9,3.5 -39.4,21.5 -43.4,42.3c-2.2,11.5 -1.1,22.2 2.9,33.1c1,2.9 2.1,5.7 3.1,8.6c4.8,13.3 9.7,26.6 14.5,39.9c15.6,42.6 31.1,85.3 46.7,127.9c13.4,36.7 26.8,73.3 40.1,110c1.5,4 3,8.1 4.5,12.2c-4,10.9 -7.9,21.8 -11.9,32.6c-10.6,29.1 -21.2,58.1 -31.8,87.2c-12,32.8 -23.9,65.5 -35.9,98.3c-8.5,23.3 -17,46.6 -25.5,69.9c-1.5,4 -2.9,8 -4.4,12c-9.5,26 1.3,56.8 26.7,69.2c7.3,3.5 14.7,5.5 22.7,6c0,0 0,0 0.1,0c0.8,0.1 1.6,0.1 2.4,0.1h0.1c0.7,0 1.5,0 2.2,-0.1c16.5,-1.2 33.8,-11.1 48.9,-17.8c25.1,-11.2 50.2,-22.5 75.3,-33.7c36.9,-16.5 73.7,-33 110.6,-49.6c43.1,-19.3 86.2,-38.6 129.3,-57.9c43.7,-19.6 87.4,-39.2 131.2,-58.8c38.9,-17.4 77.8,-34.8 116.6,-52.3c28.2,-12.6 56.5,-25.3 84.7,-37.9c11.9,-5.3 23.8,-10.7 35.8,-16c10.5,-4.7 18.8,-11.4 25.3,-21C929.5,521.2 925.9,493.2 910.1,474.7zM141,186.5c-0.2,0.4 -0.4,0.9 -0.6,1.5C140.3,187.8 140.6,187.1 141,186.5zM140,190.4c-0.1,0.4 -0.1,1 -0.2,1.8C139.7,192.1 139.8,191.3 140,190.4zM143.3,841.3c0.1,0.1 0.2,0.2 0.2,0.3C143.4,841.6 143.4,841.5 143.3,841.3C143.3,841.4 143.3,841.3 143.3,841.3zM143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1zM140.1,835.7c0.1,-0.3 0.7,1.9 0.8,2.2C140.3,836.9 139.9,836 140.1,835.7zM881.1,521.8c0.2,-0.3 0.5,-0.7 0.9,-1.1C882,520.9 881.5,521.3 881.1,521.8zM883.2,518.5c-0.2,0.3 -0.3,0.5 -0.5,0.7c0.4,-0.6 0.9,-1.4 1,-1.6C883.7,517.7 883.5,518 883.2,518.5zM884.7,513.5c0,1 -0.1,2.3 -0.2,0.9c-0.3,1 -0.7,2 -0.8,2.5c-0.2,0.5 -1.4,2.9 -1.1,2.5c-0.2,0.3 -0.4,0.6 -0.4,0.7c-0.3,0.4 -0.5,0.8 -0.8,1.2c-0.3,0.4 -0.5,0.6 -0.6,0.8c0.1,-0.1 0.2,-0.2 0.3,-0.3c-0.6,0.8 -0.7,0.8 -0.3,0.3c-0.3,0.3 -0.6,0.6 -0.7,0.7c-0.5,0.5 -1,1 -1.6,1.4c0,0 0,0 0.1,0c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3c0.2,-0.1 0.3,-0.3 0.5,-0.5c-5.2,3 -10.9,5.3 -16.3,7.7c-24,10.8 -48,21.5 -72,32.3c-41.7,18.7 -83.3,37.3 -125,56c-50.6,22.7 -101.1,45.3 -151.7,68c-50.1,22.5 -100.2,44.9 -150.3,67.4c-41.3,18.5 -82.6,37 -123.9,55.5c-23.2,10.4 -46.4,20.8 -69.5,31.2c-1.9,0.8 -3.7,1.7 -5.6,2.5c-0.3,0.1 -0.6,0.3 -1,0.4c-0.9,0.4 -1.9,0.8 -2.8,1.3c-0.6,0.3 -1.2,0.6 -1.8,0.9c-0.6,0.3 -1.2,0.6 -1.7,0.7c0.5,-0.3 1,-0.5 1.5,-0.7c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c-0.5,0 -1.1,0 -1.7,0.1c0.4,0 0.9,0.1 1.5,0.2c-0.1,0.2 -0.8,0 -1.5,-0.2c-0.1,0 -0.1,0 -0.2,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c-0.5,-0.1 -0.9,-0.3 -1,-0.3c-0.2,-0.1 -1.3,-0.3 -2.1,-0.6c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6c-0.5,-0.1 -0.8,-0.3 -0.8,-0.4c0.3,0.1 0.6,0.2 0.8,0.4c0.1,0 0.2,0.1 0.3,0.1c-0.4,-0.2 -0.8,-0.4 -1.2,-0.6c-0.8,-0.4 -1.5,-0.9 -2.3,-1.3c-0.1,0 -0.2,-0.1 -0.2,-0.1c0,0 0.1,0.1 0.1,0.1c3,2.9 -3.5,-1.8 -0.1,-0.1c-0.6,-0.6 -1.2,-1.1 -1.8,-1.7s-1.1,-1.2 -1.7,-1.8c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9l0.1,0.1c-0.5,-0.7 -1.2,-1.7 -1.8,-2.6c0,0 -0.1,-0.4 -0.2,-1.1c-0.3,-1.2 -0.6,-2.3 -0.9,-3.5c0,0.1 0,0.1 0,0.2c-0.1,2.8 -1.2,-4.9 -0.1,-0.6c0,0.2 0.1,0.3 0.1,0.4c0.1,-1.2 0,-2.5 0,-3.6c0,-0.2 0,-0.4 0,-0.6c-1.1,2.5 -0.2,-3.5 0,0c0.1,-0.2 0.2,-0.5 0.3,-0.8c0.3,-0.8 0.5,-1.6 0.7,-2.4c1,-2.9 2.1,-5.7 3.1,-8.6c5.2,-14.4 10.5,-28.8 15.7,-43.2c18.5,-50.3 36.9,-100.5 55.2,-150.6c11.2,-30.6 22.3,-61.1 33.5,-91.7h279.8c10.5,0 20.5,-9.2 20,-20s-8.8,-20 -20,-20H248.3c-6.1,-16.8 -12.2,-33.5 -18.3,-50.3c-18.6,-50.8 -37.1,-101.7 -55.7,-152.5c-10.6,-29 -21.2,-58.1 -31.8,-87.1c-0.6,-1.8 -1.4,-3.6 -1.9,-5.4c-0.1,-0.5 -0.3,-1 -0.4,-1.5c-0.1,-0.4 -0.1,-0.7 -0.2,-0.9c0,0.1 0,0.3 0,0.4c0,0.3 0.1,0.7 0.2,1.2c-0.1,-0.1 -0.2,-0.6 -0.2,-1.2c-0.2,-1.2 -0.2,-1.3 0,-0.4c0,-0.7 0.1,-1.4 0.1,-1.7V191c0.1,-0.6 0.1,-1 0.1,-1.2c0,0.2 -0.1,0.4 -0.2,0.6c0.1,-0.9 0.2,-1.1 0.2,-0.6c0.2,-0.7 0.4,-1.3 0.4,-1.6c0.1,-0.4 0.3,-0.9 0.4,-1.3c0.1,-0.4 0.2,-0.7 0.3,-0.9c-0.1,0.1 -0.2,0.3 -0.3,0.4c0.4,-0.9 0.5,-1.1 0.3,-0.5c0.3,-0.4 0.5,-0.7 0.6,-0.9c0.5,-0.9 1.1,-1.7 1.6,-2.6c-2.7,2.4 2.4,-3.8 0.1,-0.2c0,0.1 -0.1,0.1 -0.1,0.2c0.1,-0.1 0.1,-0.1 0.2,-0.2c0.6,-0.6 1.2,-1.3 1.8,-1.8c0.3,-0.3 0.5,-0.5 0.8,-0.8c-0.2,0.1 -0.4,0.3 -0.6,0.4c-0.1,0.1 -0.2,0.1 -0.3,0.2c0,0 0.1,-0.1 0.3,-0.2c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0.6,-0.4 1.3,-0.8 1.3,-0.8v0c0.7,-0.4 1.3,-0.8 2,-1.1c0,0 0,0 -0.1,0c-0.2,0.1 -0.5,0.2 -0.8,0.4c0,-0.1 0.3,-0.2 0.8,-0.4c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1c0.9,-0.3 2.5,-0.7 3.7,-1h0c0,0 0,0 0,0c1,-0.2 1.8,-0.4 1.9,-0.3c0.3,0.3 -1.1,0.3 -1.9,0.3c0.2,0 0.4,0 0.7,0c1.2,0.1 2.5,-0.2 3.8,0c-1.1,-0.4 -1.9,-0.8 1,0.1c-0.3,-0.1 -0.7,-0.1 -1,-0.1c0.5,0.2 1.1,0.4 1.4,0.5c1.6,0.5 4.7,1.8 0.5,-0.1c0.6,0.3 1.2,0.5 1.8,0.8c0.2,0.1 0.5,0.2 0.7,0.3c5.5,2.4 10.9,4.9 16.4,7.3c28.2,12.6 56.4,25.3 84.6,37.9c44.3,19.8 88.5,39.7 132.8,59.5c51.1,22.9 102.2,45.8 153.4,68.7c49.2,22 98.4,44.1 147.6,66.1c38.5,17.2 76.9,34.5 115.4,51.7c18.6,8.3 37.2,16.7 55.8,25c2.5,1.1 5.1,2.1 7.5,3.4c0.7,0.4 1.3,0.8 2,1.2c0.2,0.1 0.4,0.3 0.6,0.4c0.3,0.2 0.6,0.4 0.8,0.6c0,-0.1 -0.1,-0.1 -0.1,-0.1c-0.3,-0.2 -0.7,-0.5 -1.3,-0.9c0.3,0 0.8,0.4 1.3,0.9c0.3,0.2 0.5,0.4 0.6,0.4c0,0 -0.2,-0.1 -0.4,-0.3c0.7,0.7 1.4,1.6 1.7,1.9c0.2,0.2 0.4,0.4 0.6,0.5c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1c1.6,1 1.7,1.7 0.8,1.1c0.5,0.9 0.9,1.9 1.3,2.4c0.2,0.3 0.4,0.5 0.5,0.7c-0.2,-0.5 -0.3,-1 -0.5,-1.4c0.4,0.7 1.6,2.8 0.5,1.4c0.3,0.9 0.5,1.9 0.7,2.6c0.2,1 0.5,1.8 0.6,2.8c-0.1,-0.8 -0.2,-1.5 -0.3,-2.2c0.3,0.4 0.3,1.3 0.3,2.2c0,0 0,0 0,0c0,1 -0.2,2 -0.2,2.4c0,0.4 0,0.8 0,1C884.6,514 884.7,513.7 884.7,513.5c0,-0.4 0,-0.8 0,-0.9C884.8,512.8 884.8,513.1 884.7,513.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.8,829.1C138.7,831.6 139.6,825.7 139.8,829.1L139.8,829.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M139.7,832.9c0,0.2 0.1,0.3 0.1,0.4c0,0.1 0,0.1 0,0.2C139.7,836.3 138.6,828.6 139.7,832.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140,194.1c0,0.1 0,0.3 0,0.4C139.9,193.2 139.9,193.1 140,194.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140.2,189.8L140.2,189.8c0,0.2 -0.1,0.4 -0.2,0.6C140.2,189.5 140.2,189.3 140.2,189.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M141.3,186C141.3,186 141.3,186 141.3,186c-0.1,0.2 -0.2,0.3 -0.3,0.5C141.4,185.5 141.5,185.4 141.3,186z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M142.7,840.5c0.2,0.3 0.4,0.6 0.5,0.8c-0.2,-0.3 -0.4,-0.5 -0.6,-0.9L142.7,840.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.8,842.1c0.1,0.2 0.2,0.3 0.3,0.4C144,842.3 143.9,842.2 143.8,842.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M143.6,182.3c0,0.1 -0.1,0.1 -0.1,0.2C140.8,184.9 145.8,178.7 143.6,182.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M145.8,180.1c1,-0.8 1.6,-1.2 1.7,-1.3c-0.1,0.1 -0.4,0.4 -1,0.8c0,0 -0.1,0 -0.1,0.1c0,0 0,0 -0.1,0C146.1,179.9 145.9,180 145.8,180.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M146.2,844c0,0 0.1,0.1 0.1,0.1C149.3,847 142.8,842.3 146.2,844z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.7,177.8c0.8,-0.4 1.3,-0.6 1.5,-0.7c-0.2,0.1 -0.5,0.3 -1.2,0.6c-0.1,0 -0.1,0 -0.2,0.1C149.8,177.8 149.8,177.8 149.7,177.8C149.7,177.8 149.7,177.8 149.7,177.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M149.9,846c0.4,0.2 0.8,0.4 1.2,0.6c-0.5,-0.2 -1,-0.4 -1.5,-0.6C149.7,846 149.8,846 149.9,846L149.9,846z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153.8,847.1L153.8,847.1c0.5,0 1,0.1 1.5,0.2C155.2,847.5 154.5,847.3 153.8,847.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M153,886.9c0.8,0.1 1.6,0.1 2.4,0.1C154.6,887 153.8,887 153,886.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M154.1,847h1.4c-0.5,0 -1.1,0 -1.7,0.1c-0.1,0 -0.2,0 -0.3,0c-1,-0.2 -1.2,-0.2 -0.6,-0.2c0,0 0,0 0,0C153.3,846.9 153.6,847 154.1,847z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M155.5,887c0.7,0 1.5,0 2.2,-0.1C157,887 156.3,887 155.5,887z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M159,176.9c-0.3,-0.1 -0.7,-0.1 -1,-0.1C156.9,176.4 156.1,176 159,176.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M156.9,848c0.5,-0.3 1,-0.5 1.5,-0.7c0.1,0 0.1,0 0.2,0C158.1,847.6 157.5,847.9 156.9,848z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M160,846.5c-0.5,0.3 -1,0.5 -1.6,0.8c-0.3,-0.1 -0.7,-0.1 -1,-0.1c-0.2,0 -0.3,0 -0.5,0.1c0.1,0 0.3,-0.1 0.4,-0.1c-0.6,-0.1 -1.2,-0.1 -1.8,-0.1c0.9,0 1.8,-0.1 2.8,-0.1C158.9,846.8 159.5,846.7 160,846.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M878.6,524.1c0.8,-0.6 1.2,-0.8 1.2,-0.8c-0.1,0.1 -0.7,0.5 -1.8,1.3C878.2,524.5 878.3,524.3 878.6,524.1C878.5,524.2 878.5,524.2 878.6,524.1C878.6,524.1 878.6,524.1 878.6,524.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M879.3,500c0,-0.1 -0.1,-0.1 -0.1,-0.1c0.3,0.2 0.5,0.4 0.6,0.4C879.7,500.3 879.6,500.2 879.3,500C879.3,500 879.3,500 879.3,500z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M880.8,522c0.1,-0.1 0.2,-0.2 0.3,-0.3C880.5,522.5 880.4,522.6 880.8,522z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M881.6,502.4c-0.3,-0.5 -0.5,-0.9 -0.8,-1.1C882.4,502.3 882.5,503 881.6,502.4z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,519.2c0.4,-0.6 0.9,-1.4 1,-1.6c-0.1,0.1 -0.2,0.4 -0.6,0.9C883,518.8 882.9,519 882.8,519.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M882.8,504.1c0.4,0.7 1.6,2.8 0.5,1.4C883.2,505 883.1,504.5 882.8,504.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M884.7,513.5c0,1 -0.1,2.3 -0.2,0.9C884.6,514 884.7,513.7 884.7,513.5z" />
+</vector>
diff --git a/app/src/main/res/layout/dialog_no_network.xml b/app/src/main/res/layout/dialog_no_network.xml
index aad7f7b..cad8b3d 100644
--- a/app/src/main/res/layout/dialog_no_network.xml
+++ b/app/src/main/res/layout/dialog_no_network.xml
@@ -41,7 +41,7 @@
             android:paddingVertical="@dimen/dp_10"
             android:text="未发现网络，内容走丢了..."
             android:textColor="@color/hintTextColor"
-            android:textSize="@dimen/sp_18"
+            android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index 7755ff3..6b92ae1 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -1,15 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_solid_layout_black_transparent_radius_10"
     android:orientation="vertical"
     android:padding="@dimen/dp_10">
 
-    <TextView
-        android:id="@+id/wellTypeView"
-        style="@style/MapPopupWindowTextStyle"
-        android:text="@string/unknown" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/wellTypeView"
+            style="@style/MapPopupWindowTextStyle"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@id/navigateView"
+            android:text="@string/unknown" />
+
+        <ImageView
+            android:id="@+id/navigateView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_navigate" />
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/wellCodeView"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c7b92b5..ab8c901 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -110,7 +110,7 @@
     </style>
 
     <style name="MapPopupWindowTextStyle">
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">@dimen/dp_3</item>
         <item name="android:paddingBottom">@dimen/dp_3</item>