diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d02208d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M870.4,460.8h-51.2v51.2h25.6c14.1,0 25.6,11.5 25.6,25.6v358.4c0,14.1 -11.5,25.6 -25.6,25.6h-665.6a25.7,25.7 0,0 1,-25.6 -25.6v-358.4c0,-14.1 11.5,-25.6 25.6,-25.6H204.8V460.8H153.6c-28.2,0 -51.2,23 -51.2,51.2v409.6c0,28.2 23,51.2 51.2,51.2h716.8c28.2,0 51.2,-23 51.2,-51.2v-409.6c0,-28.2 -23,-51.2 -51.2,-51.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M512,761.7a33.9,33.9 0,0 0,26.3 -12.3c70.2,-75.5 254.6,-286.2 254.6,-410.9 0,-156.3 -126.4,-280.9 -280.9,-280.9S231.1,182.2 231.1,338.5c0,124.7 184.4,335.4 254.6,410.9 7,7 17.5,12.3 26.3,12.3zM512,110.2a227.8,227.8 0,0 1,228.3 228.3c0,68.5 -89.5,210.7 -228.3,361.7 -138.7,-152.8 -228.2,-293.2 -228.2,-361.7A227.8,227.8 0,0 1,512 110.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M634.9,338.5c0,-68.5 -54.4,-122.9 -122.9,-122.9S389.1,270 389.1,338.5 443.5,461.4 512,461.4s122.9,-54.4 122.9,-122.9zM441.8,338.5c0,-38.6 31.6,-70.2 70.2,-70.2s70.2,31.6 70.2,70.2S550.7,408.7 512,408.7s-70.2,-31.6 -70.2,-70.2z" />
+</vector>

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d02208d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M870.4,460.8h-51.2v51.2h25.6c14.1,0 25.6,11.5 25.6,25.6v358.4c0,14.1 -11.5,25.6 -25.6,25.6h-665.6a25.7,25.7 0,0 1,-25.6 -25.6v-358.4c0,-14.1 11.5,-25.6 25.6,-25.6H204.8V460.8H153.6c-28.2,0 -51.2,23 -51.2,51.2v409.6c0,28.2 23,51.2 51.2,51.2h716.8c28.2,0 51.2,-23 51.2,-51.2v-409.6c0,-28.2 -23,-51.2 -51.2,-51.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M512,761.7a33.9,33.9 0,0 0,26.3 -12.3c70.2,-75.5 254.6,-286.2 254.6,-410.9 0,-156.3 -126.4,-280.9 -280.9,-280.9S231.1,182.2 231.1,338.5c0,124.7 184.4,335.4 254.6,410.9 7,7 17.5,12.3 26.3,12.3zM512,110.2a227.8,227.8 0,0 1,228.3 228.3c0,68.5 -89.5,210.7 -228.3,361.7 -138.7,-152.8 -228.2,-293.2 -228.2,-361.7A227.8,227.8 0,0 1,512 110.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M634.9,338.5c0,-68.5 -54.4,-122.9 -122.9,-122.9S389.1,270 389.1,338.5 443.5,461.4 512,461.4s122.9,-54.4 122.9,-122.9zM441.8,338.5c0,-38.6 31.6,-70.2 70.2,-70.2s70.2,31.6 70.2,70.2S550.7,408.7 512,408.7s-70.2,-31.6 -70.2,-70.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh_white.xml b/app/src/main/res/drawable/ic_refresh_white.xml
deleted file mode 100644
index b1cb46e..0000000
--- a/app/src/main/res/drawable/ic_refresh_white.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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="M126.4,870.4c-17.6,0 -32,-14.4 -32,-32V665.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32zM897.6,390.4c-17.6,0 -32,-14.4 -32,-32V185.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M512,960c-184,0 -347.2,-110.4 -416,-281.6 -6.4,-16 1.6,-35.2 17.6,-41.6 16,-6.4 35.2,1.6 41.6,17.6C214.4,801.6 353.6,896 512,896s297.6,-94.4 356.8,-241.6c6.4,-16 25.6,-24 41.6,-17.6 16,6.4 24,25.6 17.6,41.6C859.2,849.6 696,960 512,960zM897.6,390.4c-12.8,0 -24,-8 -30.4,-20.8C809.6,222.4 670.4,128 512,128S214.4,222.4 155.2,369.6c-6.4,16 -25.6,24 -41.6,17.6 -16,-6.4 -24,-25.6 -17.6,-41.6C164.8,174.4 328,64 512,64s347.2,110.4 416,281.6c6.4,16 -1.6,35.2 -17.6,41.6 -4.8,1.6 -8,3.2 -12.8,3.2z" />
-</vector>

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d02208d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M870.4,460.8h-51.2v51.2h25.6c14.1,0 25.6,11.5 25.6,25.6v358.4c0,14.1 -11.5,25.6 -25.6,25.6h-665.6a25.7,25.7 0,0 1,-25.6 -25.6v-358.4c0,-14.1 11.5,-25.6 25.6,-25.6H204.8V460.8H153.6c-28.2,0 -51.2,23 -51.2,51.2v409.6c0,28.2 23,51.2 51.2,51.2h716.8c28.2,0 51.2,-23 51.2,-51.2v-409.6c0,-28.2 -23,-51.2 -51.2,-51.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M512,761.7a33.9,33.9 0,0 0,26.3 -12.3c70.2,-75.5 254.6,-286.2 254.6,-410.9 0,-156.3 -126.4,-280.9 -280.9,-280.9S231.1,182.2 231.1,338.5c0,124.7 184.4,335.4 254.6,410.9 7,7 17.5,12.3 26.3,12.3zM512,110.2a227.8,227.8 0,0 1,228.3 228.3c0,68.5 -89.5,210.7 -228.3,361.7 -138.7,-152.8 -228.2,-293.2 -228.2,-361.7A227.8,227.8 0,0 1,512 110.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M634.9,338.5c0,-68.5 -54.4,-122.9 -122.9,-122.9S389.1,270 389.1,338.5 443.5,461.4 512,461.4s122.9,-54.4 122.9,-122.9zM441.8,338.5c0,-38.6 31.6,-70.2 70.2,-70.2s70.2,31.6 70.2,70.2S550.7,408.7 512,408.7s-70.2,-31.6 -70.2,-70.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh_white.xml b/app/src/main/res/drawable/ic_refresh_white.xml
deleted file mode 100644
index b1cb46e..0000000
--- a/app/src/main/res/drawable/ic_refresh_white.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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="M126.4,870.4c-17.6,0 -32,-14.4 -32,-32V665.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32zM897.6,390.4c-17.6,0 -32,-14.4 -32,-32V185.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M512,960c-184,0 -347.2,-110.4 -416,-281.6 -6.4,-16 1.6,-35.2 17.6,-41.6 16,-6.4 35.2,1.6 41.6,17.6C214.4,801.6 353.6,896 512,896s297.6,-94.4 356.8,-241.6c6.4,-16 25.6,-24 41.6,-17.6 16,6.4 24,25.6 17.6,41.6C859.2,849.6 696,960 512,960zM897.6,390.4c-12.8,0 -24,-8 -30.4,-20.8C809.6,222.4 670.4,128 512,128S214.4,222.4 155.2,369.6c-6.4,16 -25.6,24 -41.6,17.6 -16,-6.4 -24,-25.6 -17.6,-41.6C164.8,174.4 328,64 512,64s347.2,110.4 416,281.6c6.4,16 -1.6,35.2 -17.6,41.6 -4.8,1.6 -8,3.2 -12.8,3.2z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml
index f79825a..4a2d5c5 100644
--- a/app/src/main/res/layout/activity_about_us.xml
+++ b/app/src/main/res/layout/activity_about_us.xml
@@ -47,7 +47,6 @@
             android:gravity="center"
             android:paddingVertical="@dimen/dp_3"
             android:text="版本信息：V1.0.0"
-            android:textColor="@color/mainTextColor"
             android:textSize="@dimen/sp_16" />
 
         <LinearLayout
@@ -63,7 +62,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="客服电话："
-                android:textColor="@color/mainTextColor"
                 android:textSize="@dimen/sp_16" />
 
             <TextView
@@ -71,7 +69,6 @@
                 android:layout_height="wrap_content"
                 android:autoLink="phone"
                 android:text="010-68387447"
-                android:textColorLink="@color/mainThemeColor"
                 android:textSize="@dimen/sp_16" />
         </LinearLayout>
     </RelativeLayout>

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d02208d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M870.4,460.8h-51.2v51.2h25.6c14.1,0 25.6,11.5 25.6,25.6v358.4c0,14.1 -11.5,25.6 -25.6,25.6h-665.6a25.7,25.7 0,0 1,-25.6 -25.6v-358.4c0,-14.1 11.5,-25.6 25.6,-25.6H204.8V460.8H153.6c-28.2,0 -51.2,23 -51.2,51.2v409.6c0,28.2 23,51.2 51.2,51.2h716.8c28.2,0 51.2,-23 51.2,-51.2v-409.6c0,-28.2 -23,-51.2 -51.2,-51.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M512,761.7a33.9,33.9 0,0 0,26.3 -12.3c70.2,-75.5 254.6,-286.2 254.6,-410.9 0,-156.3 -126.4,-280.9 -280.9,-280.9S231.1,182.2 231.1,338.5c0,124.7 184.4,335.4 254.6,410.9 7,7 17.5,12.3 26.3,12.3zM512,110.2a227.8,227.8 0,0 1,228.3 228.3c0,68.5 -89.5,210.7 -228.3,361.7 -138.7,-152.8 -228.2,-293.2 -228.2,-361.7A227.8,227.8 0,0 1,512 110.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M634.9,338.5c0,-68.5 -54.4,-122.9 -122.9,-122.9S389.1,270 389.1,338.5 443.5,461.4 512,461.4s122.9,-54.4 122.9,-122.9zM441.8,338.5c0,-38.6 31.6,-70.2 70.2,-70.2s70.2,31.6 70.2,70.2S550.7,408.7 512,408.7s-70.2,-31.6 -70.2,-70.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh_white.xml b/app/src/main/res/drawable/ic_refresh_white.xml
deleted file mode 100644
index b1cb46e..0000000
--- a/app/src/main/res/drawable/ic_refresh_white.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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="M126.4,870.4c-17.6,0 -32,-14.4 -32,-32V665.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32zM897.6,390.4c-17.6,0 -32,-14.4 -32,-32V185.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M512,960c-184,0 -347.2,-110.4 -416,-281.6 -6.4,-16 1.6,-35.2 17.6,-41.6 16,-6.4 35.2,1.6 41.6,17.6C214.4,801.6 353.6,896 512,896s297.6,-94.4 356.8,-241.6c6.4,-16 25.6,-24 41.6,-17.6 16,6.4 24,25.6 17.6,41.6C859.2,849.6 696,960 512,960zM897.6,390.4c-12.8,0 -24,-8 -30.4,-20.8C809.6,222.4 670.4,128 512,128S214.4,222.4 155.2,369.6c-6.4,16 -25.6,24 -41.6,17.6 -16,-6.4 -24,-25.6 -17.6,-41.6C164.8,174.4 328,64 512,64s347.2,110.4 416,281.6c6.4,16 -1.6,35.2 -17.6,41.6 -4.8,1.6 -8,3.2 -12.8,3.2z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml
index f79825a..4a2d5c5 100644
--- a/app/src/main/res/layout/activity_about_us.xml
+++ b/app/src/main/res/layout/activity_about_us.xml
@@ -47,7 +47,6 @@
             android:gravity="center"
             android:paddingVertical="@dimen/dp_3"
             android:text="版本信息：V1.0.0"
-            android:textColor="@color/mainTextColor"
             android:textSize="@dimen/sp_16" />
 
         <LinearLayout
@@ -63,7 +62,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="客服电话："
-                android:textColor="@color/mainTextColor"
                 android:textSize="@dimen/sp_16" />
 
             <TextView
@@ -71,7 +69,6 @@
                 android:layout_height="wrap_content"
                 android:autoLink="phone"
                 android:text="010-68387447"
-                android:textColorLink="@color/mainThemeColor"
                 android:textSize="@dimen/sp_16" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index e035231..c0e40de 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -213,7 +213,6 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:autoLink="phone"
                     android:text="010-68387447"
-                    android:textColorLink="@color/mainThemeColor"
                     android:textSize="@dimen/sp_16" />
             </RelativeLayout>
         </LinearLayout>

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d02208d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M870.4,460.8h-51.2v51.2h25.6c14.1,0 25.6,11.5 25.6,25.6v358.4c0,14.1 -11.5,25.6 -25.6,25.6h-665.6a25.7,25.7 0,0 1,-25.6 -25.6v-358.4c0,-14.1 11.5,-25.6 25.6,-25.6H204.8V460.8H153.6c-28.2,0 -51.2,23 -51.2,51.2v409.6c0,28.2 23,51.2 51.2,51.2h716.8c28.2,0 51.2,-23 51.2,-51.2v-409.6c0,-28.2 -23,-51.2 -51.2,-51.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M512,761.7a33.9,33.9 0,0 0,26.3 -12.3c70.2,-75.5 254.6,-286.2 254.6,-410.9 0,-156.3 -126.4,-280.9 -280.9,-280.9S231.1,182.2 231.1,338.5c0,124.7 184.4,335.4 254.6,410.9 7,7 17.5,12.3 26.3,12.3zM512,110.2a227.8,227.8 0,0 1,228.3 228.3c0,68.5 -89.5,210.7 -228.3,361.7 -138.7,-152.8 -228.2,-293.2 -228.2,-361.7A227.8,227.8 0,0 1,512 110.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M634.9,338.5c0,-68.5 -54.4,-122.9 -122.9,-122.9S389.1,270 389.1,338.5 443.5,461.4 512,461.4s122.9,-54.4 122.9,-122.9zM441.8,338.5c0,-38.6 31.6,-70.2 70.2,-70.2s70.2,31.6 70.2,70.2S550.7,408.7 512,408.7s-70.2,-31.6 -70.2,-70.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh_white.xml b/app/src/main/res/drawable/ic_refresh_white.xml
deleted file mode 100644
index b1cb46e..0000000
--- a/app/src/main/res/drawable/ic_refresh_white.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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="M126.4,870.4c-17.6,0 -32,-14.4 -32,-32V665.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32zM897.6,390.4c-17.6,0 -32,-14.4 -32,-32V185.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M512,960c-184,0 -347.2,-110.4 -416,-281.6 -6.4,-16 1.6,-35.2 17.6,-41.6 16,-6.4 35.2,1.6 41.6,17.6C214.4,801.6 353.6,896 512,896s297.6,-94.4 356.8,-241.6c6.4,-16 25.6,-24 41.6,-17.6 16,6.4 24,25.6 17.6,41.6C859.2,849.6 696,960 512,960zM897.6,390.4c-12.8,0 -24,-8 -30.4,-20.8C809.6,222.4 670.4,128 512,128S214.4,222.4 155.2,369.6c-6.4,16 -25.6,24 -41.6,17.6 -16,-6.4 -24,-25.6 -17.6,-41.6C164.8,174.4 328,64 512,64s347.2,110.4 416,281.6c6.4,16 -1.6,35.2 -17.6,41.6 -4.8,1.6 -8,3.2 -12.8,3.2z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml
index f79825a..4a2d5c5 100644
--- a/app/src/main/res/layout/activity_about_us.xml
+++ b/app/src/main/res/layout/activity_about_us.xml
@@ -47,7 +47,6 @@
             android:gravity="center"
             android:paddingVertical="@dimen/dp_3"
             android:text="版本信息：V1.0.0"
-            android:textColor="@color/mainTextColor"
             android:textSize="@dimen/sp_16" />
 
         <LinearLayout
@@ -63,7 +62,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="客服电话："
-                android:textColor="@color/mainTextColor"
                 android:textSize="@dimen/sp_16" />
 
             <TextView
@@ -71,7 +69,6 @@
                 android:layout_height="wrap_content"
                 android:autoLink="phone"
                 android:text="010-68387447"
-                android:textColorLink="@color/mainThemeColor"
                 android:textSize="@dimen/sp_16" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index e035231..c0e40de 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -213,7 +213,6 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:autoLink="phone"
                     android:text="010-68387447"
-                    android:textColorLink="@color/mainThemeColor"
                     android:textSize="@dimen/sp_16" />
             </RelativeLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
index 4070947..ced0d8a 100644
--- a/app/src/main/res/layout/fragment_overview.xml
+++ b/app/src/main/res/layout/fragment_overview.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -11,9 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/mainThemeColor"
-        app:tbv_right_image="@drawable/ic_change_map"
+        app:tbv_right_image="@drawable/ic_map"
         app:tbv_show_left_image="false"
-        app:tbv_show_right_image="true"
+        app:tbv_show_right_image="false"
         app:tbv_smaller_title="true"
         app:tbv_text="概览" />
 
@@ -41,6 +41,7 @@
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_3"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
     </LinearLayout>

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d02208d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M870.4,460.8h-51.2v51.2h25.6c14.1,0 25.6,11.5 25.6,25.6v358.4c0,14.1 -11.5,25.6 -25.6,25.6h-665.6a25.7,25.7 0,0 1,-25.6 -25.6v-358.4c0,-14.1 11.5,-25.6 25.6,-25.6H204.8V460.8H153.6c-28.2,0 -51.2,23 -51.2,51.2v409.6c0,28.2 23,51.2 51.2,51.2h716.8c28.2,0 51.2,-23 51.2,-51.2v-409.6c0,-28.2 -23,-51.2 -51.2,-51.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M512,761.7a33.9,33.9 0,0 0,26.3 -12.3c70.2,-75.5 254.6,-286.2 254.6,-410.9 0,-156.3 -126.4,-280.9 -280.9,-280.9S231.1,182.2 231.1,338.5c0,124.7 184.4,335.4 254.6,410.9 7,7 17.5,12.3 26.3,12.3zM512,110.2a227.8,227.8 0,0 1,228.3 228.3c0,68.5 -89.5,210.7 -228.3,361.7 -138.7,-152.8 -228.2,-293.2 -228.2,-361.7A227.8,227.8 0,0 1,512 110.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M634.9,338.5c0,-68.5 -54.4,-122.9 -122.9,-122.9S389.1,270 389.1,338.5 443.5,461.4 512,461.4s122.9,-54.4 122.9,-122.9zM441.8,338.5c0,-38.6 31.6,-70.2 70.2,-70.2s70.2,31.6 70.2,70.2S550.7,408.7 512,408.7s-70.2,-31.6 -70.2,-70.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh_white.xml b/app/src/main/res/drawable/ic_refresh_white.xml
deleted file mode 100644
index b1cb46e..0000000
--- a/app/src/main/res/drawable/ic_refresh_white.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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="M126.4,870.4c-17.6,0 -32,-14.4 -32,-32V665.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32zM897.6,390.4c-17.6,0 -32,-14.4 -32,-32V185.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M512,960c-184,0 -347.2,-110.4 -416,-281.6 -6.4,-16 1.6,-35.2 17.6,-41.6 16,-6.4 35.2,1.6 41.6,17.6C214.4,801.6 353.6,896 512,896s297.6,-94.4 356.8,-241.6c6.4,-16 25.6,-24 41.6,-17.6 16,6.4 24,25.6 17.6,41.6C859.2,849.6 696,960 512,960zM897.6,390.4c-12.8,0 -24,-8 -30.4,-20.8C809.6,222.4 670.4,128 512,128S214.4,222.4 155.2,369.6c-6.4,16 -25.6,24 -41.6,17.6 -16,-6.4 -24,-25.6 -17.6,-41.6C164.8,174.4 328,64 512,64s347.2,110.4 416,281.6c6.4,16 -1.6,35.2 -17.6,41.6 -4.8,1.6 -8,3.2 -12.8,3.2z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml
index f79825a..4a2d5c5 100644
--- a/app/src/main/res/layout/activity_about_us.xml
+++ b/app/src/main/res/layout/activity_about_us.xml
@@ -47,7 +47,6 @@
             android:gravity="center"
             android:paddingVertical="@dimen/dp_3"
             android:text="版本信息：V1.0.0"
-            android:textColor="@color/mainTextColor"
             android:textSize="@dimen/sp_16" />
 
         <LinearLayout
@@ -63,7 +62,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="客服电话："
-                android:textColor="@color/mainTextColor"
                 android:textSize="@dimen/sp_16" />
 
             <TextView
@@ -71,7 +69,6 @@
                 android:layout_height="wrap_content"
                 android:autoLink="phone"
                 android:text="010-68387447"
-                android:textColorLink="@color/mainThemeColor"
                 android:textSize="@dimen/sp_16" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index e035231..c0e40de 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -213,7 +213,6 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:autoLink="phone"
                     android:text="010-68387447"
-                    android:textColorLink="@color/mainThemeColor"
                     android:textSize="@dimen/sp_16" />
             </RelativeLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
index 4070947..ced0d8a 100644
--- a/app/src/main/res/layout/fragment_overview.xml
+++ b/app/src/main/res/layout/fragment_overview.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -11,9 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/mainThemeColor"
-        app:tbv_right_image="@drawable/ic_change_map"
+        app:tbv_right_image="@drawable/ic_map"
         app:tbv_show_left_image="false"
-        app:tbv_show_right_image="true"
+        app:tbv_show_right_image="false"
         app:tbv_smaller_title="true"
         app:tbv_text="概览" />
 
@@ -41,6 +41,7 @@
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_3"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_group_over_view_rv_l.xml b/app/src/main/res/layout/item_group_over_view_rv_l.xml
index eb7b044..bce3fb5 100644
--- a/app/src/main/res/layout/item_group_over_view_rv_l.xml
+++ b/app/src/main/res/layout/item_group_over_view_rv_l.xml
@@ -1,69 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_3"
+    app:cardUseCompatPadding="true">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="项目编号: " />
-
-        <TextView
-            android:id="@+id/groupNameView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/editGroupNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="修改"
-            android:textColor="#ABABAB" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_7"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="项目位置: " />
-
-        <TextView
-            android:id="@+id/groupLocationView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:padding="@dimen/dp_5">
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="设备总数: " />
+                android:text="项目编号: " />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
@@ -72,70 +30,121 @@
                 app:cardCornerRadius="@dimen/dp_10">
 
                 <TextView
-                    android:id="@+id/totalDeviceNumView"
+                    android:id="@+id/groupNameView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_7"
-                    android:text="999"
-                    android:textColor="@color/white" />
+                    android:layout_marginHorizontal="@dimen/dp_7"
+                    android:drawablePadding="@dimen/dp_5"
+                    android:paddingVertical="1dp"
+                    android:text="@string/app_name"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_12"
+                    app:drawableEndCompat="@drawable/ic_edit" />
             </androidx.cardview.widget.CardView>
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_7"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
+            android:layout_marginVertical="@dimen/dp_3"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="已激活: " />
+                android:text="项目位置: " />
 
-            <androidx.cardview.widget.CardView
+            <TextView
+                android:id="@+id/groupLocationView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:backgroundTint="@color/greenColor"
-                app:cardCornerRadius="@dimen/dp_10">
+                android:text="设备总数: " />
+
+            <TextView
+                android:id="@+id/totalDeviceNumView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:fontFamily="sans-serif-black"
+                android:text="999"
+                android:textColor="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="台(套)" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_3"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="已被激活: " />
 
                 <TextView
                     android:id="@+id/inUseDeviceNumView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_7"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:fontFamily="sans-serif-black"
                     android:text="999"
-                    android:textColor="@color/white" />
-            </androidx.cardview.widget.CardView>
-        </LinearLayout>
+                    android:textColor="@color/greenColor" />
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="台(套)" />
+            </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="未激活: " />
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-            <androidx.cardview.widget.CardView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:backgroundTint="@color/orangeTextColor"
-                app:cardCornerRadius="@dimen/dp_10">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="未被激活: " />
 
                 <TextView
                     android:id="@+id/notUseDeviceNumView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_7"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:fontFamily="sans-serif-black"
                     android:text="999"
-                    android:textColor="@color/white" />
-            </androidx.cardview.widget.CardView>
+                    android:textColor="@color/orangeTextColor" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="台(套)" />
+            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
index dd09cf5..96debfb 100644
--- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
+++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.casic.smarttube.fragment
 
-import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,18 +14,15 @@
 import com.casic.smarttube.databinding.FragmentOverviewBinding
 import com.casic.smarttube.model.ProjectGroupModel
 import com.casic.smarttube.view.GroupDeviceActivity
-import com.casic.smarttube.view.GroupDeviceMapActivity
 import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
 import com.pengxh.kt.lite.adapter.ViewHolder
 import com.pengxh.kt.lite.base.KotlinBaseFragment
-import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
 import com.pengxh.kt.lite.extensions.navigatePageTo
 import com.pengxh.kt.lite.extensions.show
 import com.pengxh.kt.lite.utils.LoadState
 import com.pengxh.kt.lite.utils.LoadingDialog
 import com.pengxh.kt.lite.widget.EmptyView
-import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertInputDialog
 
 class OverviewFragment : KotlinBaseFragment<FragmentOverviewBinding>() {
@@ -45,15 +41,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
 
-            }
-
-            override fun onRightClick() {
-                requireContext().navigatePageTo<GroupDeviceMapActivity>()
-            }
-        })
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -102,7 +90,7 @@
                                 .setText(R.id.totalDeviceNumView, item.totalDevice)
                                 .setText(R.id.inUseDeviceNumView, item.alive)
                                 .setText(R.id.notUseDeviceNumView, item.unalive)
-                                .setOnClickListener(R.id.editGroupNameView) {
+                                .setOnClickListener(R.id.groupNameView) {
                                     clickedPosition = position
                                     editGroupName(item)
                                 }
@@ -112,15 +100,15 @@
                                     "经纬度异常，无法查看具体位置"
                                 )
                             } else {
-                                val point =
-                                    LatLonPoint(item.latGaode.toDouble(), item.lngGaode.toDouble())
+                                val point = LatLonPoint(
+                                    item.latGaode.toDouble(), item.lngGaode.toDouble()
+                                )
                                 val queryParam = RegeocodeQuery(point, 200f, GeocodeSearch.AMAP)
                                 geocoderSearch.getFromLocationAsyn(queryParam)
                                 geocoderSearch.setOnGeocodeSearchListener(object :
                                     GeocodeSearch.OnGeocodeSearchListener {
                                     override fun onRegeocodeSearched(
-                                        result: RegeocodeResult?,
-                                        rCode: Int
+                                        result: RegeocodeResult?, rCode: Int
                                     ) {
                                         if (rCode == 1000) {
                                             viewHolder.setText(
@@ -131,8 +119,7 @@
                                     }
 
                                     override fun onGeocodeSearched(
-                                        result: GeocodeResult?,
-                                        rCode: Int
+                                        result: GeocodeResult?, rCode: Int
                                     ) {
 
                                     }
@@ -140,15 +127,11 @@
                             }
                         }
                     }
-                    binding.recyclerView.addItemDecoration(
-                        RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)
-                    )
                     binding.recyclerView.adapter = groupListAdapter
                     groupListAdapter.setOnItemClickedListener(object :
                         NormalRecyclerAdapter.OnItemClickedListener<ProjectGroupModel.DataModel> {
                         override fun onItemClicked(
-                            position: Int,
-                            item: ProjectGroupModel.DataModel
+                            position: Int, item: ProjectGroupModel.DataModel
                         ) {
                             requireContext().navigatePageTo<GroupDeviceActivity>(item.groupId)
                         }
diff --git a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
index dd3735d..54cac79 100644
--- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
+++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt
@@ -35,9 +35,13 @@
         )
     }
 
-    val DEVICE_OPERATE_IMAGES =
-        intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white)
-    val DEVICE_OPERATE_TITLES = arrayOf("浓度排序", "全部删除", "批量删除")
+    val DEVICE_OPERATE_IMAGES = intArrayOf(
+        R.drawable.ic_map,
+        R.drawable.ic_order,
+        R.drawable.ic_delete_white,
+        R.drawable.ic_delete_white
+    )
+    val DEVICE_OPERATE_TITLES = arrayOf("地图分布", "浓度排序", "全部删除", "批量删除")
 
     /**
      * =============================================================================================
diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
index b977427..f2e7692 100644
--- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt
@@ -15,7 +15,7 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainThemeColor)
+        binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor)
         binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
             override fun onLeftClick() {
                 finish()
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
index 3e98725..a2ed62a 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt
@@ -112,11 +112,20 @@
                     LocaleConstant.DEVICE_OPERATE_IMAGES[2], LocaleConstant.DEVICE_OPERATE_TITLES[2]
                 )
             )
+            add(
+                EasyPopupWindow.MenuItem(
+                    LocaleConstant.DEVICE_OPERATE_IMAGES[3], LocaleConstant.DEVICE_OPERATE_TITLES[3]
+                )
+            )
         }
         easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener {
             override fun onPopupItemClicked(position: Int) {
                 when (position) {
                     0 -> {
+                        navigatePageTo<GroupDeviceMapActivity>(groupId)
+                    }
+
+                    1 -> {
                         order = if (order == 0) {
                             1
                         } else {
@@ -126,7 +135,7 @@
                         getDeviceListByPage()
                     }
 
-                    1 -> {
+                    2 -> {
                         AlertControlDialog.Builder().setContext(context).setTitle("提示")
                             .setMessage("删除后将无法恢复，是否继续？")
                             .setNegativeButton("容我想想").setPositiveButton("已经想好")
@@ -149,7 +158,7 @@
                             }).build().show()
                     }
 
-                    2 -> {
+                    3 -> {
                         MultiSelectDialog.Builder().setContext(this@GroupDeviceActivity)
                             .setTitle("选择设备").setDataSource(dataRows)
                             .setNegativeButton("取消").setPositiveButton("选好了")
diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
index c33c40e..75ad5c1 100644
--- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
+++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt
@@ -24,8 +24,11 @@
 import com.casic.smarttube.model.MapDeviceModel
 import com.casic.smarttube.utils.RouteOnMap
 import com.casic.smarttube.vm.DeviceViewModel
+import com.casic.smarttube.vm.ProjectGroupViewModel
 import com.pengxh.kt.lite.base.KotlinBaseActivity
 import com.pengxh.kt.lite.extensions.show
+import com.pengxh.kt.lite.extensions.wrapLine
+import com.pengxh.kt.lite.utils.LiteKitConstant
 import com.pengxh.kt.lite.widget.TitleBarView
 import com.pengxh.kt.lite.widget.dialog.AlertControlDialog
 
@@ -36,6 +39,7 @@
     private val context = this
     private val geocoderSearch by lazy { GeocodeSearch(this) }
     private lateinit var aMap: AMap
+    private lateinit var groupViewModel: ProjectGroupViewModel
     private lateinit var deviceViewModel: DeviceViewModel
     private var clickedMarker: Marker? = null
 
@@ -70,13 +74,33 @@
     }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
+        val groupId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!!
+
         //地图初始化
         initMap(savedInstanceState)
 
-        //默认显示所有设备
         deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java]
         deviceViewModel.mapDeviceModel.observe(this) {
             if (it.code == 200) {
+                it.data.forEach { device ->
+                    val lat = device.latGaode.toString()
+                    val lng = device.lngGaode.toString()
+                    if (lat.isNotBlank() && lng.isNotBlank()) {
+                        val latitude = lat.toDouble()
+                        val longitude = lng.toDouble()
+                        if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
+                            //缓存所有设备详情，点击Marker时候需要
+                            deviceModels.add(device)
+                        }
+                    }
+                }
+            }
+        }
+        deviceViewModel.getMapDeviceList()
+
+        groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java]
+        groupViewModel.groupDeviceModel.observe(this) {
+            if (it.code == 200) {
                 val allMarkerOptions = ArrayList<MarkerOptions>()
                 val latitudeList = ArrayList<Double>()
                 val longitudeList = ArrayList<Double>()
@@ -84,20 +108,15 @@
                     val lat = device.latGaode.toString()
                     val lng = device.lngGaode.toString()
                     if (lat.isNotBlank() && lng.isNotBlank()) {
-                        //返回true代表当前位置在大陆、港澳地区，反之不在
                         val latitude = lat.toDouble()
                         val longitude = lng.toDouble()
                         if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) {
-                            //缓存所有设备详情，点击Marker时候需要
-                            deviceModels.add(device)
                             //分别缓存经、纬度
                             latitudeList.add(latitude)
                             longitudeList.add(longitude)
                             //将所有设备信息转化缓存为Marker点
-                            allMarkerOptions.add(
-                                MarkerOptions().position(LatLng(latitude, longitude))
-                                    .title(device.devcode).snippet(device.modelName)
-                            )
+                            val latLng = LatLng(latitude, longitude)
+                            allMarkerOptions.add(MarkerOptions().position(latLng))
                         }
                     }
                 }
@@ -112,7 +131,7 @@
                 aMap.animateCamera(cameraUpdate, 1500, null)
             }
         }
-        deviceViewModel.getMapDeviceList()
+        groupViewModel.getDeviceListByGroup(groupId)
     }
 
     override fun initEvent() {
@@ -145,7 +164,6 @@
 
     }
 
-    //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker
     override fun onCameraChangeFinish(cameraPosition: CameraPosition?) {
 
     }
@@ -216,14 +234,8 @@
                         override fun onRegeocodeSearched(result: RegeocodeResult?, rCode: Int) {
                             if (rCode == 1000) {
                                 val address = result?.regeocodeAddress?.formatAddress
-                                val temp = StringBuilder()
-                                if (address!!.length > 16) {
-                                    temp.append(address.substring(0, 14)).append("\r\n")
-                                        .append(address.substring(16))
-                                } else {
-                                    temp.append(address)
-                                }
-                                locationView.text = String.format("详细位置: $temp")
+                                locationView.text =
+                                    String.format("详细位置: ${address?.wrapLine(14)}")
                             }
                         }
 
diff --git a/app/src/main/res/drawable/ic_change_map.xml b/app/src/main/res/drawable/ic_change_map.xml
deleted file mode 100644
index c567efa..0000000
--- a/app/src/main/res/drawable/ic_change_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="112px"
-    android:height="112px"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M810.89,610.55a28.84,28.84 0,0 0,-11.02 2.21h-0.12l-0.12,0.08L532.48,723.35l-267.14,-110.55 -0.12,-0.04 -0.12,-0.04a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42zM243.1,416.36l278.12,115.1 0.12,0.04 0.12,0.04a28.47,28.47 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.84,28.84 0,0 0,0 -53.21l-278.12,-115.1 -0.12,-0.04 -0.12,-0.04a28.67,28.67 0,0 0,-22.04 0h-0.12l-0.12,0.08 -278.12,115.1a28.79,28.79 0,0 0,0 53.21zM810.89,485.74a28.84,28.84 0,0 0,-11.02 2.21l-0.12,0.04 -0.12,0.04 -267.14,110.55 -267.14,-110.55h-0.12l-0.12,-0.08a28.79,28.79 0,0 0,-22.04 53.21l278.16,115.1 0.12,0.04 0.12,0.04a28.55,28.55 0,0 0,22.04 0h0.12l0.12,-0.08 278.12,-115.1a28.79,28.79 0,0 0,-10.98 -55.42z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 0000000..de035a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48px"
+    android:height="48px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M874.67,231.04l-91.09,-90.45a42.67,42.67 0,0 0,-60.16 0l-407.47,407.25L277.33,685.23a42.67,42.67 0,0 0,10.67 42.67,42.67 42.67,0 0,0 42.67,10.88l137.39,-39.25L874.67,291.41a42.67,42.67 0,0 0,0 -60.37zM814.29,261.12l-60.37,60.37 -60.37,-60.37 60.37,-60.37zM349.23,666.45l24.32,-85.33 274.35,-274.77 60.37,60.37 -274.99,274.99z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M777.17,896H228.05a90.88,90.88 0,0 1,-90.67 -90.88V275.63a90.88,90.88 0,0 1,90.67 -90.67H492.8a32,32 0,0 1,0 64H228.05a26.67,26.67 0,0 0,-26.67 26.67v529.49A26.67,26.67 0,0 0,228.05 832h549.12a26.67,26.67 0,0 0,26.88 -26.88V540.37a32,32 0,0 1,64 0v264.75A90.88,90.88 0,0 1,777.17 896z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 0000000..d02208d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M870.4,460.8h-51.2v51.2h25.6c14.1,0 25.6,11.5 25.6,25.6v358.4c0,14.1 -11.5,25.6 -25.6,25.6h-665.6a25.7,25.7 0,0 1,-25.6 -25.6v-358.4c0,-14.1 11.5,-25.6 25.6,-25.6H204.8V460.8H153.6c-28.2,0 -51.2,23 -51.2,51.2v409.6c0,28.2 23,51.2 51.2,51.2h716.8c28.2,0 51.2,-23 51.2,-51.2v-409.6c0,-28.2 -23,-51.2 -51.2,-51.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M512,761.7a33.9,33.9 0,0 0,26.3 -12.3c70.2,-75.5 254.6,-286.2 254.6,-410.9 0,-156.3 -126.4,-280.9 -280.9,-280.9S231.1,182.2 231.1,338.5c0,124.7 184.4,335.4 254.6,410.9 7,7 17.5,12.3 26.3,12.3zM512,110.2a227.8,227.8 0,0 1,228.3 228.3c0,68.5 -89.5,210.7 -228.3,361.7 -138.7,-152.8 -228.2,-293.2 -228.2,-361.7A227.8,227.8 0,0 1,512 110.2z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M634.9,338.5c0,-68.5 -54.4,-122.9 -122.9,-122.9S389.1,270 389.1,338.5 443.5,461.4 512,461.4s122.9,-54.4 122.9,-122.9zM441.8,338.5c0,-38.6 31.6,-70.2 70.2,-70.2s70.2,31.6 70.2,70.2S550.7,408.7 512,408.7s-70.2,-31.6 -70.2,-70.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh_white.xml b/app/src/main/res/drawable/ic_refresh_white.xml
deleted file mode 100644
index b1cb46e..0000000
--- a/app/src/main/res/drawable/ic_refresh_white.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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="M126.4,870.4c-17.6,0 -32,-14.4 -32,-32V665.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32zM897.6,390.4c-17.6,0 -32,-14.4 -32,-32V185.6c0,-17.6 14.4,-32 32,-32s32,14.4 32,32v172.8c0,17.6 -14.4,32 -32,32z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M512,960c-184,0 -347.2,-110.4 -416,-281.6 -6.4,-16 1.6,-35.2 17.6,-41.6 16,-6.4 35.2,1.6 41.6,17.6C214.4,801.6 353.6,896 512,896s297.6,-94.4 356.8,-241.6c6.4,-16 25.6,-24 41.6,-17.6 16,6.4 24,25.6 17.6,41.6C859.2,849.6 696,960 512,960zM897.6,390.4c-12.8,0 -24,-8 -30.4,-20.8C809.6,222.4 670.4,128 512,128S214.4,222.4 155.2,369.6c-6.4,16 -25.6,24 -41.6,17.6 -16,-6.4 -24,-25.6 -17.6,-41.6C164.8,174.4 328,64 512,64s347.2,110.4 416,281.6c6.4,16 -1.6,35.2 -17.6,41.6 -4.8,1.6 -8,3.2 -12.8,3.2z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml
index f79825a..4a2d5c5 100644
--- a/app/src/main/res/layout/activity_about_us.xml
+++ b/app/src/main/res/layout/activity_about_us.xml
@@ -47,7 +47,6 @@
             android:gravity="center"
             android:paddingVertical="@dimen/dp_3"
             android:text="版本信息：V1.0.0"
-            android:textColor="@color/mainTextColor"
             android:textSize="@dimen/sp_16" />
 
         <LinearLayout
@@ -63,7 +62,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="客服电话："
-                android:textColor="@color/mainTextColor"
                 android:textSize="@dimen/sp_16" />
 
             <TextView
@@ -71,7 +69,6 @@
                 android:layout_height="wrap_content"
                 android:autoLink="phone"
                 android:text="010-68387447"
-                android:textColorLink="@color/mainThemeColor"
                 android:textSize="@dimen/sp_16" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index e035231..c0e40de 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -213,7 +213,6 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:autoLink="phone"
                     android:text="010-68387447"
-                    android:textColorLink="@color/mainThemeColor"
                     android:textSize="@dimen/sp_16" />
             </RelativeLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
index 4070947..ced0d8a 100644
--- a/app/src/main/res/layout/fragment_overview.xml
+++ b/app/src/main/res/layout/fragment_overview.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/mainBackColor"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -11,9 +11,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/mainThemeColor"
-        app:tbv_right_image="@drawable/ic_change_map"
+        app:tbv_right_image="@drawable/ic_map"
         app:tbv_show_left_image="false"
-        app:tbv_show_right_image="true"
+        app:tbv_show_right_image="false"
         app:tbv_smaller_title="true"
         app:tbv_text="概览" />
 
@@ -41,6 +41,7 @@
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_3"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_group_over_view_rv_l.xml b/app/src/main/res/layout/item_group_over_view_rv_l.xml
index eb7b044..bce3fb5 100644
--- a/app/src/main/res/layout/item_group_over_view_rv_l.xml
+++ b/app/src/main/res/layout/item_group_over_view_rv_l.xml
@@ -1,69 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="@dimen/dp_10">
+    android:layout_marginHorizontal="@dimen/dp_3"
+    app:cardUseCompatPadding="true">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="项目编号: " />
-
-        <TextView
-            android:id="@+id/groupNameView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/editGroupNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="修改"
-            android:textColor="#ABABAB" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/dp_7"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="项目位置: " />
-
-        <TextView
-            android:id="@+id/groupLocationView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:padding="@dimen/dp_5">
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="设备总数: " />
+                android:text="项目编号: " />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
@@ -72,70 +30,121 @@
                 app:cardCornerRadius="@dimen/dp_10">
 
                 <TextView
-                    android:id="@+id/totalDeviceNumView"
+                    android:id="@+id/groupNameView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_7"
-                    android:text="999"
-                    android:textColor="@color/white" />
+                    android:layout_marginHorizontal="@dimen/dp_7"
+                    android:drawablePadding="@dimen/dp_5"
+                    android:paddingVertical="1dp"
+                    android:text="@string/app_name"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_12"
+                    app:drawableEndCompat="@drawable/ic_edit" />
             </androidx.cardview.widget.CardView>
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_7"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
+            android:layout_marginVertical="@dimen/dp_3"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="已激活: " />
+                android:text="项目位置: " />
 
-            <androidx.cardview.widget.CardView
+            <TextView
+                android:id="@+id/groupLocationView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:backgroundTint="@color/greenColor"
-                app:cardCornerRadius="@dimen/dp_10">
+                android:text="设备总数: " />
+
+            <TextView
+                android:id="@+id/totalDeviceNumView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_5"
+                android:fontFamily="sans-serif-black"
+                android:text="999"
+                android:textColor="@color/mainThemeColor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="台(套)" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_3"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="已被激活: " />
 
                 <TextView
                     android:id="@+id/inUseDeviceNumView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_7"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:fontFamily="sans-serif-black"
                     android:text="999"
-                    android:textColor="@color/white" />
-            </androidx.cardview.widget.CardView>
-        </LinearLayout>
+                    android:textColor="@color/greenColor" />
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="台(套)" />
+            </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="未激活: " />
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-            <androidx.cardview.widget.CardView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:backgroundTint="@color/orangeTextColor"
-                app:cardCornerRadius="@dimen/dp_10">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="未被激活: " />
 
                 <TextView
                     android:id="@+id/notUseDeviceNumView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/dp_7"
+                    android:layout_marginHorizontal="@dimen/dp_5"
+                    android:fontFamily="sans-serif-black"
                     android:text="999"
-                    android:textColor="@color/white" />
-            </androidx.cardview.widget.CardView>
+                    android:textColor="@color/orangeTextColor" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="台(套)" />
+            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popu_map_info.xml b/app/src/main/res/layout/popu_map_info.xml
index afea2c2..9752990 100644
--- a/app/src/main/res/layout/popu_map_info.xml
+++ b/app/src/main/res/layout/popu_map_info.xml
@@ -10,12 +10,12 @@
     <TextView
         android:id="@+id/deviceCodeView"
         style="@style/MapPopupWindowTextStyle"
-        android:text="@string/unknown" />
+        android:text="设备编号: 数据加载中..." />
 
     <TextView
         android:id="@+id/deviceModelView"
         style="@style/MapPopupWindowTextStyle"
-        android:text="@string/unknown" />
+        android:text="设备模型: 数据加载中..." />
 
     <TextView
         android:id="@+id/deviceValueView"