diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80db05c..a972027 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -18,9 +17,6 @@ - - - - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80db05c..a972027 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -18,9 +17,6 @@ - - - - + diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index fd0e20b..c4ac71a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -113,8 +113,9 @@ }) loginViewModel.loadState.observe(this, { loginState -> when (loginState) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后") + is LoadState.Success -> { + "登录成功".show(this) + DialogHelper.dismissLoadingDialog() } else -> { DialogHelper.dismissLoadingDialog() @@ -123,5 +124,8 @@ }) } }) + authenticateViewModel.loadState.observe(this, { + DialogHelper.showLoadingDialog(this, "登录中，请稍后") + }) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80db05c..a972027 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -18,9 +17,6 @@ - - - - + diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index fd0e20b..c4ac71a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -113,8 +113,9 @@ }) loginViewModel.loadState.observe(this, { loginState -> when (loginState) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后") + is LoadState.Success -> { + "登录成功".show(this) + DialogHelper.dismissLoadingDialog() } else -> { DialogHelper.dismissLoadingDialog() @@ -123,5 +124,8 @@ }) } }) + authenticateViewModel.loadState.observe(this, { + DialogHelper.showLoadingDialog(this, "登录中，请稍后") + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 3a204c1..ce088dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -106,7 +106,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { navigatePageTo(position, urls) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80db05c..a972027 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -18,9 +17,6 @@ - - - - + diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index fd0e20b..c4ac71a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -113,8 +113,9 @@ }) loginViewModel.loadState.observe(this, { loginState -> when (loginState) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后") + is LoadState.Success -> { + "登录成功".show(this) + DialogHelper.dismissLoadingDialog() } else -> { DialogHelper.dismissLoadingDialog() @@ -123,5 +124,8 @@ }) } }) + authenticateViewModel.loadState.observe(this, { + DialogHelper.showLoadingDialog(this, "登录中，请稍后") + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 3a204c1..ce088dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -106,7 +106,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { navigatePageTo(position, urls) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index ee831d1..3043d3f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Point import android.os.Bundle +import android.os.CountDownTimer import android.util.Log import android.view.LayoutInflater import android.view.View @@ -19,6 +20,7 @@ import com.casic.app.smartwell.adapter.HomeRecycleAdapter import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.WellListModel +import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity @@ -104,6 +106,9 @@ wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) //获取所有窨井数据 + httpCountDownTimer.start() + DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...") + //获取所有窨井数据 wellListViewModel.obtainAllWell() wellListViewModel.listModel.observe(viewLifecycleOwner, { if (it.code == 200) { @@ -139,9 +144,9 @@ //计算所有点的中心点位置 val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) //移动到指定经纬度 - val cameraPosition = CameraPosition(centerLatLng, 10f, 0f, 0f) + val cameraPosition = CameraPosition(centerLatLng, 12f, 0f, 0f) val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(cameraUpdate, 3000, null) + aMap.animateCamera(cameraUpdate, 1500, null) } }) @@ -218,9 +223,25 @@ } + /** + * 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() } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80db05c..a972027 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -18,9 +17,6 @@ - - - - + diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index fd0e20b..c4ac71a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -113,8 +113,9 @@ }) loginViewModel.loadState.observe(this, { loginState -> when (loginState) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后") + is LoadState.Success -> { + "登录成功".show(this) + DialogHelper.dismissLoadingDialog() } else -> { DialogHelper.dismissLoadingDialog() @@ -123,5 +124,8 @@ }) } }) + authenticateViewModel.loadState.observe(this, { + DialogHelper.showLoadingDialog(this, "登录中，请稍后") + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 3a204c1..ce088dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -106,7 +106,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { navigatePageTo(position, urls) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index ee831d1..3043d3f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Point import android.os.Bundle +import android.os.CountDownTimer import android.util.Log import android.view.LayoutInflater import android.view.View @@ -19,6 +20,7 @@ import com.casic.app.smartwell.adapter.HomeRecycleAdapter import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.WellListModel +import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity @@ -104,6 +106,9 @@ wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) //获取所有窨井数据 + httpCountDownTimer.start() + DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...") + //获取所有窨井数据 wellListViewModel.obtainAllWell() wellListViewModel.listModel.observe(viewLifecycleOwner, { if (it.code == 200) { @@ -139,9 +144,9 @@ //计算所有点的中心点位置 val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) //移动到指定经纬度 - val cameraPosition = CameraPosition(centerLatLng, 10f, 0f, 0f) + val cameraPosition = CameraPosition(centerLatLng, 12f, 0f, 0f) val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(cameraUpdate, 3000, null) + aMap.animateCamera(cameraUpdate, 1500, null) } }) @@ -218,9 +223,25 @@ } + /** + * 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() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index c106180..16f4fd5 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -11,6 +11,7 @@ import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState class AuthenticateViewModel : BaseViewModel() { @@ -18,6 +19,7 @@ val keyModel = MutableLiveData() fun obtainPublicKey() = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80db05c..a972027 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -18,9 +17,6 @@ - - - - + diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index fd0e20b..c4ac71a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -113,8 +113,9 @@ }) loginViewModel.loadState.observe(this, { loginState -> when (loginState) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后") + is LoadState.Success -> { + "登录成功".show(this) + DialogHelper.dismissLoadingDialog() } else -> { DialogHelper.dismissLoadingDialog() @@ -123,5 +124,8 @@ }) } }) + authenticateViewModel.loadState.observe(this, { + DialogHelper.showLoadingDialog(this, "登录中，请稍后") + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 3a204c1..ce088dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -106,7 +106,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { navigatePageTo(position, urls) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index ee831d1..3043d3f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Point import android.os.Bundle +import android.os.CountDownTimer import android.util.Log import android.view.LayoutInflater import android.view.View @@ -19,6 +20,7 @@ import com.casic.app.smartwell.adapter.HomeRecycleAdapter import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.WellListModel +import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity @@ -104,6 +106,9 @@ wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) //获取所有窨井数据 + httpCountDownTimer.start() + DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...") + //获取所有窨井数据 wellListViewModel.obtainAllWell() wellListViewModel.listModel.observe(viewLifecycleOwner, { if (it.code == 200) { @@ -139,9 +144,9 @@ //计算所有点的中心点位置 val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) //移动到指定经纬度 - val cameraPosition = CameraPosition(centerLatLng, 10f, 0f, 0f) + val cameraPosition = CameraPosition(centerLatLng, 12f, 0f, 0f) val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(cameraUpdate, 3000, null) + aMap.animateCamera(cameraUpdate, 1500, null) } }) @@ -218,9 +223,25 @@ } + /** + * 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() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index c106180..16f4fd5 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -11,6 +11,7 @@ import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState class AuthenticateViewModel : BaseViewModel() { @@ -18,6 +19,7 @@ val keyModel = MutableLiveData() fun obtainPublicKey() = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index a847a80..5975763 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -20,12 +20,10 @@ val outResultModel = MutableLiveData() fun enter(account: String, secretKey: String) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.login(account, secretKey) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "登录成功".show(BaseApplication.obtainInstance()) enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80db05c..a972027 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -18,9 +17,6 @@ - - - - + diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index fd0e20b..c4ac71a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -113,8 +113,9 @@ }) loginViewModel.loadState.observe(this, { loginState -> when (loginState) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后") + is LoadState.Success -> { + "登录成功".show(this) + DialogHelper.dismissLoadingDialog() } else -> { DialogHelper.dismissLoadingDialog() @@ -123,5 +124,8 @@ }) } }) + authenticateViewModel.loadState.observe(this, { + DialogHelper.showLoadingDialog(this, "登录中，请稍后") + }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 3a204c1..ce088dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -106,7 +106,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { navigatePageTo(position, urls) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index ee831d1..3043d3f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -2,6 +2,7 @@ import android.graphics.Point import android.os.Bundle +import android.os.CountDownTimer import android.util.Log import android.view.LayoutInflater import android.view.View @@ -19,6 +20,7 @@ import com.casic.app.smartwell.adapter.HomeRecycleAdapter import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.WellListModel +import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity @@ -104,6 +106,9 @@ wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) //获取所有窨井数据 + httpCountDownTimer.start() + DialogHelper.showLoadingDialog(requireActivity(), "数据加载中，请稍后...") + //获取所有窨井数据 wellListViewModel.obtainAllWell() wellListViewModel.listModel.observe(viewLifecycleOwner, { if (it.code == 200) { @@ -139,9 +144,9 @@ //计算所有点的中心点位置 val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) //移动到指定经纬度 - val cameraPosition = CameraPosition(centerLatLng, 10f, 0f, 0f) + val cameraPosition = CameraPosition(centerLatLng, 12f, 0f, 0f) val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(cameraUpdate, 3000, null) + aMap.animateCamera(cameraUpdate, 1500, null) } }) @@ -218,9 +223,25 @@ } + /** + * 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() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index c106180..16f4fd5 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -11,6 +11,7 @@ import com.pengxh.kt.lite.extensions.launch import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState class AuthenticateViewModel : BaseViewModel() { @@ -18,6 +19,7 @@ val keyModel = MutableLiveData() fun obtainPublicKey() = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index a847a80..5975763 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -20,12 +20,10 @@ val outResultModel = MutableLiveData() fun enter(account: String, secretKey: String) = launch({ - loadState.value = LoadState.Loading val response = RetrofitServiceManager.login(account, secretKey) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "登录成功".show(BaseApplication.obtainInstance()) enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml deleted file mode 100644 index 064f301..0000000 --- a/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file