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 51ab57d..4bf310c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -2,7 +2,6 @@ import android.graphics.Point import android.os.Bundle -import android.os.CountDownTimer import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -10,7 +9,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -88,9 +86,6 @@ //代码设置底部拉升距离 val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) homeView.coordinatorLayout.post { -// bottomSheetBehavior.isFitToContents = false -// bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) -// bottomSheetBehavior.isHideable = false bottomSheetBehavior.isFitToContents = false bottomSheetBehavior.halfExpandedRatio = 0.33f bottomSheetBehavior.isHideable = false @@ -104,9 +99,18 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) - //获取所有窨井数据 - httpCountDownTimer.start() - DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...") + //地图初始化 + initMap(savedInstanceState) + + homeView.addDeviceButton.setOnClickListener { + requireContext().navigatePageTo() + } + return homeView + } + + override fun onResume() { + super.onResume() + homeView.mapView.onResume() //获取所有设备数据 deviceViewModel.obtainMapDeviceList() //获取组 @@ -139,8 +143,6 @@ } } } - //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } @@ -150,14 +152,6 @@ bindRecyclerView(it.data) } }) - - //地图初始化 - initMap(savedInstanceState) - - homeView.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } - return homeView } private fun initMap(savedInstanceState: Bundle?) { @@ -182,7 +176,6 @@ private fun bindRecyclerView(dataBeans: MutableList) { groupListAdapter = GroupListAdapter(requireContext(), dataBeans) - homeView.homeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) homeView.homeRecyclerView!!.addItemDecoration( DividerItemDecoration( requireContext(), DividerItemDecoration.VERTICAL @@ -195,12 +188,6 @@ groupViewModel.obtainDeviceListByGroup(dataBeans[position].groupId) } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") - else -> DialogHelper.dismissLoadingDialog() - } - }) groupViewModel.groupDeviceModel.observe(this, { if (it.code == 200) { val latitudeList: MutableList = ArrayList() @@ -220,11 +207,16 @@ } } //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } }) + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") + else -> DialogHelper.dismissLoadingDialog() + } + }) } //移动到指定经纬度 @@ -244,25 +236,9 @@ } - /** - * http请求计时器 - * */ - private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) { - override fun onFinish() { - "请求服务器超时，请退出后重试".show(requireContext()) - DialogHelper.dismissLoadingDialog() - } - - override fun onTick(millisUntilFinished: Long) { - - } - } - //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker override fun onCameraChangeFinish(p0: CameraPosition?) { //地图缩放之后显示聚合点数据 - DialogHelper.dismissLoadingDialog() - httpCountDownTimer.cancel() initClustersMarkers() } @@ -403,10 +379,6 @@ } /***以下是地图生命周期管理************************************************************************/ - override fun onResume() { - super.onResume() - homeView.mapView.onResume() - } override fun onPause() { super.onPause() 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 51ab57d..4bf310c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -2,7 +2,6 @@ import android.graphics.Point import android.os.Bundle -import android.os.CountDownTimer import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -10,7 +9,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -88,9 +86,6 @@ //代码设置底部拉升距离 val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) homeView.coordinatorLayout.post { -// bottomSheetBehavior.isFitToContents = false -// bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) -// bottomSheetBehavior.isHideable = false bottomSheetBehavior.isFitToContents = false bottomSheetBehavior.halfExpandedRatio = 0.33f bottomSheetBehavior.isHideable = false @@ -104,9 +99,18 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) - //获取所有窨井数据 - httpCountDownTimer.start() - DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...") + //地图初始化 + initMap(savedInstanceState) + + homeView.addDeviceButton.setOnClickListener { + requireContext().navigatePageTo() + } + return homeView + } + + override fun onResume() { + super.onResume() + homeView.mapView.onResume() //获取所有设备数据 deviceViewModel.obtainMapDeviceList() //获取组 @@ -139,8 +143,6 @@ } } } - //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } @@ -150,14 +152,6 @@ bindRecyclerView(it.data) } }) - - //地图初始化 - initMap(savedInstanceState) - - homeView.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } - return homeView } private fun initMap(savedInstanceState: Bundle?) { @@ -182,7 +176,6 @@ private fun bindRecyclerView(dataBeans: MutableList) { groupListAdapter = GroupListAdapter(requireContext(), dataBeans) - homeView.homeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) homeView.homeRecyclerView!!.addItemDecoration( DividerItemDecoration( requireContext(), DividerItemDecoration.VERTICAL @@ -195,12 +188,6 @@ groupViewModel.obtainDeviceListByGroup(dataBeans[position].groupId) } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") - else -> DialogHelper.dismissLoadingDialog() - } - }) groupViewModel.groupDeviceModel.observe(this, { if (it.code == 200) { val latitudeList: MutableList = ArrayList() @@ -220,11 +207,16 @@ } } //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } }) + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") + else -> DialogHelper.dismissLoadingDialog() + } + }) } //移动到指定经纬度 @@ -244,25 +236,9 @@ } - /** - * http请求计时器 - * */ - private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) { - override fun onFinish() { - "请求服务器超时，请退出后重试".show(requireContext()) - DialogHelper.dismissLoadingDialog() - } - - override fun onTick(millisUntilFinished: Long) { - - } - } - //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker override fun onCameraChangeFinish(p0: CameraPosition?) { //地图缩放之后显示聚合点数据 - DialogHelper.dismissLoadingDialog() - httpCountDownTimer.cancel() initClustersMarkers() } @@ -403,10 +379,6 @@ } /***以下是地图生命周期管理************************************************************************/ - override fun onResume() { - super.onResume() - homeView.mapView.onResume() - } override fun onPause() { super.onPause() diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index c868af4..fbb6e55 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -4,7 +4,10 @@ import com.casic.smarttube.base.BaseApplication import com.casic.smarttube.extensions.separateResponseCode import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.* +import com.casic.smarttube.model.DeviceDetailModel +import com.casic.smarttube.model.DeviceHistoryDataModel +import com.casic.smarttube.model.LastDataModel +import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +23,6 @@ val deviceDetailModel = MutableLiveData() val historyDataModel = MutableLiveData() val lastDataModel = MutableLiveData() - val addDeviceResult = MutableLiveData() fun obtainMapDeviceList() = launch({ val response = RetrofitServiceManager.obtainMapDeviceList() @@ -116,9 +118,6 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - addDeviceResult.value = gson.fromJson( - response, object : TypeToken() {}.type - ) } else { loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) 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 51ab57d..4bf310c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -2,7 +2,6 @@ import android.graphics.Point import android.os.Bundle -import android.os.CountDownTimer import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -10,7 +9,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory @@ -88,9 +86,6 @@ //代码设置底部拉升距离 val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) homeView.coordinatorLayout.post { -// bottomSheetBehavior.isFitToContents = false -// bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) -// bottomSheetBehavior.isHideable = false bottomSheetBehavior.isFitToContents = false bottomSheetBehavior.halfExpandedRatio = 0.33f bottomSheetBehavior.isHideable = false @@ -104,9 +99,18 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) - //获取所有窨井数据 - httpCountDownTimer.start() - DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...") + //地图初始化 + initMap(savedInstanceState) + + homeView.addDeviceButton.setOnClickListener { + requireContext().navigatePageTo() + } + return homeView + } + + override fun onResume() { + super.onResume() + homeView.mapView.onResume() //获取所有设备数据 deviceViewModel.obtainMapDeviceList() //获取组 @@ -139,8 +143,6 @@ } } } - //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } @@ -150,14 +152,6 @@ bindRecyclerView(it.data) } }) - - //地图初始化 - initMap(savedInstanceState) - - homeView.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } - return homeView } private fun initMap(savedInstanceState: Bundle?) { @@ -182,7 +176,6 @@ private fun bindRecyclerView(dataBeans: MutableList) { groupListAdapter = GroupListAdapter(requireContext(), dataBeans) - homeView.homeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) homeView.homeRecyclerView!!.addItemDecoration( DividerItemDecoration( requireContext(), DividerItemDecoration.VERTICAL @@ -195,12 +188,6 @@ groupViewModel.obtainDeviceListByGroup(dataBeans[position].groupId) } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") - else -> DialogHelper.dismissLoadingDialog() - } - }) groupViewModel.groupDeviceModel.observe(this, { if (it.code == 200) { val latitudeList: MutableList = ArrayList() @@ -220,11 +207,16 @@ } } //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } }) + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") + else -> DialogHelper.dismissLoadingDialog() + } + }) } //移动到指定经纬度 @@ -244,25 +236,9 @@ } - /** - * http请求计时器 - * */ - private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) { - override fun onFinish() { - "请求服务器超时，请退出后重试".show(requireContext()) - DialogHelper.dismissLoadingDialog() - } - - override fun onTick(millisUntilFinished: Long) { - - } - } - //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker override fun onCameraChangeFinish(p0: CameraPosition?) { //地图缩放之后显示聚合点数据 - DialogHelper.dismissLoadingDialog() - httpCountDownTimer.cancel() initClustersMarkers() } @@ -403,10 +379,6 @@ } /***以下是地图生命周期管理************************************************************************/ - override fun onResume() { - super.onResume() - homeView.mapView.onResume() - } override fun onPause() { super.onPause() diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index c868af4..fbb6e55 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -4,7 +4,10 @@ import com.casic.smarttube.base.BaseApplication import com.casic.smarttube.extensions.separateResponseCode import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.* +import com.casic.smarttube.model.DeviceDetailModel +import com.casic.smarttube.model.DeviceHistoryDataModel +import com.casic.smarttube.model.LastDataModel +import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +23,6 @@ val deviceDetailModel = MutableLiveData() val historyDataModel = MutableLiveData() val lastDataModel = MutableLiveData() - val addDeviceResult = MutableLiveData() fun obtainMapDeviceList() = launch({ val response = RetrofitServiceManager.obtainMapDeviceList() @@ -116,9 +118,6 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - addDeviceResult.value = gson.fromJson( - response, object : TypeToken() {}.type - ) } else { loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml index d43c7b8..6020f09 100644 --- a/app/src/main/res/drawable/ic_right.xml +++ b/app/src/main/res/drawable/ic_right.xml @@ -1,6 +1,6 @@ () + } + return homeView + } + + override fun onResume() { + super.onResume() + homeView.mapView.onResume() //获取所有设备数据 deviceViewModel.obtainMapDeviceList() //获取组 @@ -139,8 +143,6 @@ } } } - //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } @@ -150,14 +152,6 @@ bindRecyclerView(it.data) } }) - - //地图初始化 - initMap(savedInstanceState) - - homeView.addDeviceButton.setOnClickListener { - requireContext().navigatePageTo() - } - return homeView } private fun initMap(savedInstanceState: Bundle?) { @@ -182,7 +176,6 @@ private fun bindRecyclerView(dataBeans: MutableList) { groupListAdapter = GroupListAdapter(requireContext(), dataBeans) - homeView.homeRecyclerView!!.layoutManager = LinearLayoutManager(requireContext()) homeView.homeRecyclerView!!.addItemDecoration( DividerItemDecoration( requireContext(), DividerItemDecoration.VERTICAL @@ -195,12 +188,6 @@ groupViewModel.obtainDeviceListByGroup(dataBeans[position].groupId) } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") - else -> DialogHelper.dismissLoadingDialog() - } - }) groupViewModel.groupDeviceModel.observe(this, { if (it.code == 200) { val latitudeList: MutableList = ArrayList() @@ -220,11 +207,16 @@ } } //计算所有点的中心点位置 -// val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) val centerLatLng = LatLng(latitudeList[0], longitudeList[0]) moveToPosition(centerLatLng) } }) + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> DialogHelper.showLoadingDialog(requireActivity(), "数据加载中...") + else -> DialogHelper.dismissLoadingDialog() + } + }) } //移动到指定经纬度 @@ -244,25 +236,9 @@ } - /** - * http请求计时器 - * */ - private val httpCountDownTimer = object : CountDownTimer(15 * 1000, 1000) { - override fun onFinish() { - "请求服务器超时，请退出后重试".show(requireContext()) - DialogHelper.dismissLoadingDialog() - } - - override fun onTick(millisUntilFinished: Long) { - - } - } - //获取视野内的marker 根据聚合算法合成自定义的marker 显示视野内的marker override fun onCameraChangeFinish(p0: CameraPosition?) { //地图缩放之后显示聚合点数据 - DialogHelper.dismissLoadingDialog() - httpCountDownTimer.cancel() initClustersMarkers() } @@ -403,10 +379,6 @@ } /***以下是地图生命周期管理************************************************************************/ - override fun onResume() { - super.onResume() - homeView.mapView.onResume() - } override fun onPause() { super.onPause() diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index c868af4..fbb6e55 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -4,7 +4,10 @@ import com.casic.smarttube.base.BaseApplication import com.casic.smarttube.extensions.separateResponseCode import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.* +import com.casic.smarttube.model.DeviceDetailModel +import com.casic.smarttube.model.DeviceHistoryDataModel +import com.casic.smarttube.model.LastDataModel +import com.casic.smarttube.model.MapDeviceModel import com.casic.smarttube.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,7 +23,6 @@ val deviceDetailModel = MutableLiveData() val historyDataModel = MutableLiveData() val lastDataModel = MutableLiveData() - val addDeviceResult = MutableLiveData() fun obtainMapDeviceList() = launch({ val response = RetrofitServiceManager.obtainMapDeviceList() @@ -116,9 +118,6 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - addDeviceResult.value = gson.fromJson( - response, object : TypeToken() {}.type - ) } else { loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) diff --git a/app/src/main/res/drawable/ic_right.xml b/app/src/main/res/drawable/ic_right.xml index d43c7b8..6020f09 100644 --- a/app/src/main/res/drawable/ic_right.xml +++ b/app/src/main/res/drawable/ic_right.xml @@ -1,6 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />