diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 63595df..72a3f43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -25,7 +25,6 @@ import com.casic.br.operationsite.vm.LoginViewModel import com.casic.br.operationsite.vm.WorkSiteViewModel import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.gson.Gson import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.ActivityStackManager @@ -43,13 +42,13 @@ private val context = this private val devices = ArrayList() private val workers = ArrayList() - private val gson = Gson() private lateinit var aMap: AMap private lateinit var workSiteViewModel: WorkSiteViewModel private lateinit var loginViewModel: LoginViewModel private lateinit var userHelmetCode: String private lateinit var bottomSheetBehavior: BottomSheetBehavior<*> private var clickedMarker: Marker? = null + private var isReloadData = false /** * 自定义Marker弹出框 @@ -383,6 +382,9 @@ override fun observeRequestState() { workSiteViewModel.loadState.observe(this) { + if (isReloadData) { + return@observe + } when (it) { LoadState.Loading -> LoadingDialog.show(this, "数据加载中,请稍后...") @@ -409,10 +411,10 @@ } binding.reloadDataView.setOnClickListener { + isReloadData = true aMap.clear() - + workSiteViewModel.getProjectDetail(this, RuntimeCache.projectId) workSiteViewModel.getWorkSiteWorkers(this, RuntimeCache.projectId) - workSiteViewModel.getWorkSiteDevices(this, RuntimeCache.projectId) } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 63595df..72a3f43 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -25,7 +25,6 @@ import com.casic.br.operationsite.vm.LoginViewModel import com.casic.br.operationsite.vm.WorkSiteViewModel import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.gson.Gson import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.ActivityStackManager @@ -43,13 +42,13 @@ private val context = this private val devices = ArrayList() private val workers = ArrayList() - private val gson = Gson() private lateinit var aMap: AMap private lateinit var workSiteViewModel: WorkSiteViewModel private lateinit var loginViewModel: LoginViewModel private lateinit var userHelmetCode: String private lateinit var bottomSheetBehavior: BottomSheetBehavior<*> private var clickedMarker: Marker? = null + private var isReloadData = false /** * 自定义Marker弹出框 @@ -383,6 +382,9 @@ override fun observeRequestState() { workSiteViewModel.loadState.observe(this) { + if (isReloadData) { + return@observe + } when (it) { LoadState.Loading -> LoadingDialog.show(this, "数据加载中,请稍后...") @@ -409,10 +411,10 @@ } binding.reloadDataView.setOnClickListener { + isReloadData = true aMap.clear() - + workSiteViewModel.getProjectDetail(this, RuntimeCache.projectId) workSiteViewModel.getWorkSiteWorkers(this, RuntimeCache.projectId) - workSiteViewModel.getWorkSiteDevices(this, RuntimeCache.projectId) } } diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index ae7b340..10d76c2 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -22,66 +22,73 @@ android:layout_height="match_parent" android:orientation="vertical"> - + app:cardCornerRadius="@dimen/dp_10" + app:cardUseCompatPadding="true"> + android:layout_margin="@dimen/dp_10" + android:orientation="vertical"> + + + + + + + + android:text="负责人:" + android:textColor="@color/black" /> - + android:autoLink="phone" + android:text="电话:" + android:textColor="@color/black" /> + + + + - - - - - - - - - +