diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 5ebc06f..ab6743f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.TextView import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -24,7 +23,6 @@ import com.casic.smarttube.databinding.FragmentHomeBinding import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.model.ProjectGroupModel -import com.casic.smarttube.utils.LocaleConstant import com.casic.smarttube.utils.RouteOnMap import com.casic.smarttube.view.AddDeviceActivity import com.casic.smarttube.vm.DeviceViewModel @@ -36,7 +34,6 @@ 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.EasyPopupWindow import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -47,7 +44,6 @@ private val kTag = "HomePageFragment" private val geocoderSearch by lazy { GeocodeSearch(requireContext()) } - private val easyPopupWindow by lazy { EasyPopupWindow(requireContext()) } private lateinit var aMap: AMap private lateinit var deviceViewModel: DeviceViewModel private lateinit var groupViewModel: ProjectGroupViewModel @@ -77,7 +73,7 @@ } override fun onRightClick() { - easyPopupWindow.showAsDropDown(binding.titleView, binding.titleView.width, 0) + requireContext().navigatePageTo() } }) } @@ -92,27 +88,6 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - val menuItems = ArrayList().apply { - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[0], LocaleConstant.POPUP_TITLES[0] - ) - ) - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[1], LocaleConstant.POPUP_TITLES[1] - ) - ) - } - easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener { - override fun onPopupItemClicked(position: Int) { - when (position) { - 0 -> aMap.mapType = AMap.MAP_TYPE_NORMAL - 1 -> aMap.mapType = AMap.MAP_TYPE_SATELLITE - } - } - }) - //地图初始化 initMap(savedInstanceState) @@ -163,7 +138,6 @@ bindRecyclerView(it) } } - groupViewModel.getProGroupList() groupViewModel.groupDeviceModel.observe(this) { if (it.code == 200) { @@ -193,8 +167,9 @@ } private fun bindRecyclerView(it: ProjectGroupModel) { - groupListAdapter = object : - NormalRecyclerAdapter(R.layout.item_group_rv_l, it.data) { + groupListAdapter = object : NormalRecyclerAdapter( + R.layout.item_group_rv_l, it.data + ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: ProjectGroupModel.DataModel ) { @@ -226,9 +201,6 @@ } } } - binding.homeRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) binding.homeRecyclerView.adapter = groupListAdapter groupListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { @@ -240,9 +212,7 @@ } override fun initEvent() { - binding.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } + } private fun initMap(savedInstanceState: Bundle?) { @@ -397,6 +367,7 @@ override fun onResume() { super.onResume() binding.mapView.onResume() + groupViewModel.getProGroupList() } override fun onPause() { diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 5ebc06f..ab6743f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.TextView import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -24,7 +23,6 @@ import com.casic.smarttube.databinding.FragmentHomeBinding import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.model.ProjectGroupModel -import com.casic.smarttube.utils.LocaleConstant import com.casic.smarttube.utils.RouteOnMap import com.casic.smarttube.view.AddDeviceActivity import com.casic.smarttube.vm.DeviceViewModel @@ -36,7 +34,6 @@ 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.EasyPopupWindow import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -47,7 +44,6 @@ private val kTag = "HomePageFragment" private val geocoderSearch by lazy { GeocodeSearch(requireContext()) } - private val easyPopupWindow by lazy { EasyPopupWindow(requireContext()) } private lateinit var aMap: AMap private lateinit var deviceViewModel: DeviceViewModel private lateinit var groupViewModel: ProjectGroupViewModel @@ -77,7 +73,7 @@ } override fun onRightClick() { - easyPopupWindow.showAsDropDown(binding.titleView, binding.titleView.width, 0) + requireContext().navigatePageTo() } }) } @@ -92,27 +88,6 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - val menuItems = ArrayList().apply { - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[0], LocaleConstant.POPUP_TITLES[0] - ) - ) - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[1], LocaleConstant.POPUP_TITLES[1] - ) - ) - } - easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener { - override fun onPopupItemClicked(position: Int) { - when (position) { - 0 -> aMap.mapType = AMap.MAP_TYPE_NORMAL - 1 -> aMap.mapType = AMap.MAP_TYPE_SATELLITE - } - } - }) - //地图初始化 initMap(savedInstanceState) @@ -163,7 +138,6 @@ bindRecyclerView(it) } } - groupViewModel.getProGroupList() groupViewModel.groupDeviceModel.observe(this) { if (it.code == 200) { @@ -193,8 +167,9 @@ } private fun bindRecyclerView(it: ProjectGroupModel) { - groupListAdapter = object : - NormalRecyclerAdapter(R.layout.item_group_rv_l, it.data) { + groupListAdapter = object : NormalRecyclerAdapter( + R.layout.item_group_rv_l, it.data + ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: ProjectGroupModel.DataModel ) { @@ -226,9 +201,6 @@ } } } - binding.homeRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) binding.homeRecyclerView.adapter = groupListAdapter groupListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { @@ -240,9 +212,7 @@ } override fun initEvent() { - binding.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } + } private fun initMap(savedInstanceState: Bundle?) { @@ -397,6 +367,7 @@ override fun onResume() { super.onResume() binding.mapView.onResume() + groupViewModel.getProGroupList() } override fun onPause() { 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 9c9ad26..dd3735d 100644 --- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt @@ -34,8 +34,6 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE ) } - val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) - val POPUP_TITLES = arrayOf("标准地图", "卫星地图") val DEVICE_OPERATE_IMAGES = intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white) @@ -48,7 +46,6 @@ * */ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 - const val RADIUS_SIZE = 10 //相距多少米才聚合，单位：米 /** * ============================================================================================= diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 5ebc06f..ab6743f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.TextView import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -24,7 +23,6 @@ import com.casic.smarttube.databinding.FragmentHomeBinding import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.model.ProjectGroupModel -import com.casic.smarttube.utils.LocaleConstant import com.casic.smarttube.utils.RouteOnMap import com.casic.smarttube.view.AddDeviceActivity import com.casic.smarttube.vm.DeviceViewModel @@ -36,7 +34,6 @@ 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.EasyPopupWindow import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -47,7 +44,6 @@ private val kTag = "HomePageFragment" private val geocoderSearch by lazy { GeocodeSearch(requireContext()) } - private val easyPopupWindow by lazy { EasyPopupWindow(requireContext()) } private lateinit var aMap: AMap private lateinit var deviceViewModel: DeviceViewModel private lateinit var groupViewModel: ProjectGroupViewModel @@ -77,7 +73,7 @@ } override fun onRightClick() { - easyPopupWindow.showAsDropDown(binding.titleView, binding.titleView.width, 0) + requireContext().navigatePageTo() } }) } @@ -92,27 +88,6 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - val menuItems = ArrayList().apply { - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[0], LocaleConstant.POPUP_TITLES[0] - ) - ) - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[1], LocaleConstant.POPUP_TITLES[1] - ) - ) - } - easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener { - override fun onPopupItemClicked(position: Int) { - when (position) { - 0 -> aMap.mapType = AMap.MAP_TYPE_NORMAL - 1 -> aMap.mapType = AMap.MAP_TYPE_SATELLITE - } - } - }) - //地图初始化 initMap(savedInstanceState) @@ -163,7 +138,6 @@ bindRecyclerView(it) } } - groupViewModel.getProGroupList() groupViewModel.groupDeviceModel.observe(this) { if (it.code == 200) { @@ -193,8 +167,9 @@ } private fun bindRecyclerView(it: ProjectGroupModel) { - groupListAdapter = object : - NormalRecyclerAdapter(R.layout.item_group_rv_l, it.data) { + groupListAdapter = object : NormalRecyclerAdapter( + R.layout.item_group_rv_l, it.data + ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: ProjectGroupModel.DataModel ) { @@ -226,9 +201,6 @@ } } } - binding.homeRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) binding.homeRecyclerView.adapter = groupListAdapter groupListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { @@ -240,9 +212,7 @@ } override fun initEvent() { - binding.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } + } private fun initMap(savedInstanceState: Bundle?) { @@ -397,6 +367,7 @@ override fun onResume() { super.onResume() binding.mapView.onResume() + groupViewModel.getProGroupList() } override fun onPause() { 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 9c9ad26..dd3735d 100644 --- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt @@ -34,8 +34,6 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE ) } - val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) - val POPUP_TITLES = arrayOf("标准地图", "卫星地图") val DEVICE_OPERATE_IMAGES = intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white) @@ -48,7 +46,6 @@ * */ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 - const val RADIUS_SIZE = 10 //相距多少米才聚合，单位：米 /** * ============================================================================================= diff --git a/app/src/main/res/drawable/ic_menu_map.xml b/app/src/main/res/drawable/ic_menu_map.xml deleted file mode 100644 index 85ab880..0000000 --- a/app/src/main/res/drawable/ic_menu_map.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 5ebc06f..ab6743f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.TextView import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -24,7 +23,6 @@ import com.casic.smarttube.databinding.FragmentHomeBinding import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.model.ProjectGroupModel -import com.casic.smarttube.utils.LocaleConstant import com.casic.smarttube.utils.RouteOnMap import com.casic.smarttube.view.AddDeviceActivity import com.casic.smarttube.vm.DeviceViewModel @@ -36,7 +34,6 @@ 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.EasyPopupWindow import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -47,7 +44,6 @@ private val kTag = "HomePageFragment" private val geocoderSearch by lazy { GeocodeSearch(requireContext()) } - private val easyPopupWindow by lazy { EasyPopupWindow(requireContext()) } private lateinit var aMap: AMap private lateinit var deviceViewModel: DeviceViewModel private lateinit var groupViewModel: ProjectGroupViewModel @@ -77,7 +73,7 @@ } override fun onRightClick() { - easyPopupWindow.showAsDropDown(binding.titleView, binding.titleView.width, 0) + requireContext().navigatePageTo() } }) } @@ -92,27 +88,6 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - val menuItems = ArrayList().apply { - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[0], LocaleConstant.POPUP_TITLES[0] - ) - ) - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[1], LocaleConstant.POPUP_TITLES[1] - ) - ) - } - easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener { - override fun onPopupItemClicked(position: Int) { - when (position) { - 0 -> aMap.mapType = AMap.MAP_TYPE_NORMAL - 1 -> aMap.mapType = AMap.MAP_TYPE_SATELLITE - } - } - }) - //地图初始化 initMap(savedInstanceState) @@ -163,7 +138,6 @@ bindRecyclerView(it) } } - groupViewModel.getProGroupList() groupViewModel.groupDeviceModel.observe(this) { if (it.code == 200) { @@ -193,8 +167,9 @@ } private fun bindRecyclerView(it: ProjectGroupModel) { - groupListAdapter = object : - NormalRecyclerAdapter(R.layout.item_group_rv_l, it.data) { + groupListAdapter = object : NormalRecyclerAdapter( + R.layout.item_group_rv_l, it.data + ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: ProjectGroupModel.DataModel ) { @@ -226,9 +201,6 @@ } } } - binding.homeRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) binding.homeRecyclerView.adapter = groupListAdapter groupListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { @@ -240,9 +212,7 @@ } override fun initEvent() { - binding.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } + } private fun initMap(savedInstanceState: Bundle?) { @@ -397,6 +367,7 @@ override fun onResume() { super.onResume() binding.mapView.onResume() + groupViewModel.getProGroupList() } override fun onPause() { 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 9c9ad26..dd3735d 100644 --- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt @@ -34,8 +34,6 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE ) } - val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) - val POPUP_TITLES = arrayOf("标准地图", "卫星地图") val DEVICE_OPERATE_IMAGES = intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white) @@ -48,7 +46,6 @@ * */ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 - const val RADIUS_SIZE = 10 //相距多少米才聚合，单位：米 /** * ============================================================================================= diff --git a/app/src/main/res/drawable/ic_menu_map.xml b/app/src/main/res/drawable/ic_menu_map.xml deleted file mode 100644 index 85ab880..0000000 --- a/app/src/main/res/drawable/ic_menu_map.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_satellite.xml b/app/src/main/res/drawable/ic_satellite.xml deleted file mode 100644 index 9116ac8..0000000 --- a/app/src/main/res/drawable/ic_satellite.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 5ebc06f..ab6743f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.TextView import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -24,7 +23,6 @@ import com.casic.smarttube.databinding.FragmentHomeBinding import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.model.ProjectGroupModel -import com.casic.smarttube.utils.LocaleConstant import com.casic.smarttube.utils.RouteOnMap import com.casic.smarttube.view.AddDeviceActivity import com.casic.smarttube.vm.DeviceViewModel @@ -36,7 +34,6 @@ 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.EasyPopupWindow import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -47,7 +44,6 @@ private val kTag = "HomePageFragment" private val geocoderSearch by lazy { GeocodeSearch(requireContext()) } - private val easyPopupWindow by lazy { EasyPopupWindow(requireContext()) } private lateinit var aMap: AMap private lateinit var deviceViewModel: DeviceViewModel private lateinit var groupViewModel: ProjectGroupViewModel @@ -77,7 +73,7 @@ } override fun onRightClick() { - easyPopupWindow.showAsDropDown(binding.titleView, binding.titleView.width, 0) + requireContext().navigatePageTo() } }) } @@ -92,27 +88,6 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - val menuItems = ArrayList().apply { - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[0], LocaleConstant.POPUP_TITLES[0] - ) - ) - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[1], LocaleConstant.POPUP_TITLES[1] - ) - ) - } - easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener { - override fun onPopupItemClicked(position: Int) { - when (position) { - 0 -> aMap.mapType = AMap.MAP_TYPE_NORMAL - 1 -> aMap.mapType = AMap.MAP_TYPE_SATELLITE - } - } - }) - //地图初始化 initMap(savedInstanceState) @@ -163,7 +138,6 @@ bindRecyclerView(it) } } - groupViewModel.getProGroupList() groupViewModel.groupDeviceModel.observe(this) { if (it.code == 200) { @@ -193,8 +167,9 @@ } private fun bindRecyclerView(it: ProjectGroupModel) { - groupListAdapter = object : - NormalRecyclerAdapter(R.layout.item_group_rv_l, it.data) { + groupListAdapter = object : NormalRecyclerAdapter( + R.layout.item_group_rv_l, it.data + ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: ProjectGroupModel.DataModel ) { @@ -226,9 +201,6 @@ } } } - binding.homeRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) binding.homeRecyclerView.adapter = groupListAdapter groupListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { @@ -240,9 +212,7 @@ } override fun initEvent() { - binding.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } + } private fun initMap(savedInstanceState: Bundle?) { @@ -397,6 +367,7 @@ override fun onResume() { super.onResume() binding.mapView.onResume() + groupViewModel.getProGroupList() } override fun onPause() { 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 9c9ad26..dd3735d 100644 --- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt @@ -34,8 +34,6 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE ) } - val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) - val POPUP_TITLES = arrayOf("标准地图", "卫星地图") val DEVICE_OPERATE_IMAGES = intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white) @@ -48,7 +46,6 @@ * */ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 - const val RADIUS_SIZE = 10 //相距多少米才聚合，单位：米 /** * ============================================================================================= diff --git a/app/src/main/res/drawable/ic_menu_map.xml b/app/src/main/res/drawable/ic_menu_map.xml deleted file mode 100644 index 85ab880..0000000 --- a/app/src/main/res/drawable/ic_menu_map.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_satellite.xml b/app/src/main/res/drawable/ic_satellite.xml deleted file mode 100644 index 9116ac8..0000000 --- a/app/src/main/res/drawable/ic_satellite.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 92daa2b..9616185 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackColor" android:orientation="vertical"> + android:layout_height="match_parent"> - - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore index 42afabf..956c004 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -/build \ No newline at end of file +/build +/release \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 5ebc06f..ab6743f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.TextView import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -24,7 +23,6 @@ import com.casic.smarttube.databinding.FragmentHomeBinding import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.model.ProjectGroupModel -import com.casic.smarttube.utils.LocaleConstant import com.casic.smarttube.utils.RouteOnMap import com.casic.smarttube.view.AddDeviceActivity import com.casic.smarttube.vm.DeviceViewModel @@ -36,7 +34,6 @@ 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.EasyPopupWindow import com.pengxh.kt.lite.widget.TitleBarView import com.pengxh.kt.lite.widget.dialog.AlertControlDialog @@ -47,7 +44,6 @@ private val kTag = "HomePageFragment" private val geocoderSearch by lazy { GeocodeSearch(requireContext()) } - private val easyPopupWindow by lazy { EasyPopupWindow(requireContext()) } private lateinit var aMap: AMap private lateinit var deviceViewModel: DeviceViewModel private lateinit var groupViewModel: ProjectGroupViewModel @@ -77,7 +73,7 @@ } override fun onRightClick() { - easyPopupWindow.showAsDropDown(binding.titleView, binding.titleView.width, 0) + requireContext().navigatePageTo() } }) } @@ -92,27 +88,6 @@ } override fun initOnCreate(savedInstanceState: Bundle?) { - val menuItems = ArrayList().apply { - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[0], LocaleConstant.POPUP_TITLES[0] - ) - ) - add( - EasyPopupWindow.MenuItem( - LocaleConstant.POPUP_IMAGES[1], LocaleConstant.POPUP_TITLES[1] - ) - ) - } - easyPopupWindow.set(menuItems, object : EasyPopupWindow.OnPopupWindowClickListener { - override fun onPopupItemClicked(position: Int) { - when (position) { - 0 -> aMap.mapType = AMap.MAP_TYPE_NORMAL - 1 -> aMap.mapType = AMap.MAP_TYPE_SATELLITE - } - } - }) - //地图初始化 initMap(savedInstanceState) @@ -163,7 +138,6 @@ bindRecyclerView(it) } } - groupViewModel.getProGroupList() groupViewModel.groupDeviceModel.observe(this) { if (it.code == 200) { @@ -193,8 +167,9 @@ } private fun bindRecyclerView(it: ProjectGroupModel) { - groupListAdapter = object : - NormalRecyclerAdapter(R.layout.item_group_rv_l, it.data) { + groupListAdapter = object : NormalRecyclerAdapter( + R.layout.item_group_rv_l, it.data + ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: ProjectGroupModel.DataModel ) { @@ -226,9 +201,6 @@ } } } - binding.homeRecyclerView.addItemDecoration( - DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) - ) binding.homeRecyclerView.adapter = groupListAdapter groupListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { @@ -240,9 +212,7 @@ } override fun initEvent() { - binding.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } + } private fun initMap(savedInstanceState: Bundle?) { @@ -397,6 +367,7 @@ override fun onResume() { super.onResume() binding.mapView.onResume() + groupViewModel.getProGroupList() } override fun onPause() { 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 9c9ad26..dd3735d 100644 --- a/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/smarttube/utils/LocaleConstant.kt @@ -34,8 +34,6 @@ Manifest.permission.WRITE_EXTERNAL_STORAGE ) } - val POPUP_IMAGES = intArrayOf(R.drawable.ic_menu_map, R.drawable.ic_satellite) - val POPUP_TITLES = arrayOf("标准地图", "卫星地图") val DEVICE_OPERATE_IMAGES = intArrayOf(R.drawable.ic_order, R.drawable.ic_delete_white, R.drawable.ic_delete_white) @@ -48,7 +46,6 @@ * */ const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 - const val RADIUS_SIZE = 10 //相距多少米才聚合，单位：米 /** * ============================================================================================= diff --git a/app/src/main/res/drawable/ic_menu_map.xml b/app/src/main/res/drawable/ic_menu_map.xml deleted file mode 100644 index 85ab880..0000000 --- a/app/src/main/res/drawable/ic_menu_map.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_satellite.xml b/app/src/main/res/drawable/ic_satellite.xml deleted file mode 100644 index 9116ac8..0000000 --- a/app/src/main/res/drawable/ic_satellite.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 92daa2b..9616185 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackColor" android:orientation="vertical"> + android:layout_height="match_parent"> - - \ 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 c52d088..afea2c2 100644 --- a/app/src/main/res/layout/popu_map_info.xml +++ b/app/src/main/res/layout/popu_map_info.xml @@ -1,7 +1,7 @@