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 eb25cb8..c48efa3 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 @@ -24,6 +24,7 @@ import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.LoginViewModel import com.casic.br.operationsite.vm.WorkSiteViewModel +import com.google.android.material.bottomsheet.BottomSheetBehavior import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.ActivityStackManager @@ -46,6 +47,7 @@ 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 /** @@ -209,10 +211,16 @@ navigatePageTo() } } + + // 初始化 BottomSheetBehavior + bottomSheetBehavior = BottomSheetBehavior.from(binding.cardView) + bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN } override fun onMarkerClick(marker: Marker?): Boolean { Log.d(kTag, "onMarkerClick: ${marker?.options?.title}") + // 显示 CardView + bottomSheetBehavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED marker?.apply { infoWindow = if (this.options.title.toString().startsWith("AQS")) { LayoutInflater.from(context).inflate(R.layout.popup_safety_tree_info, null) 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 eb25cb8..c48efa3 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 @@ -24,6 +24,7 @@ import com.casic.br.operationsite.utils.RuntimeCache import com.casic.br.operationsite.vm.LoginViewModel import com.casic.br.operationsite.vm.WorkSiteViewModel +import com.google.android.material.bottomsheet.BottomSheetBehavior import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.ActivityStackManager @@ -46,6 +47,7 @@ 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 /** @@ -209,10 +211,16 @@ navigatePageTo() } } + + // 初始化 BottomSheetBehavior + bottomSheetBehavior = BottomSheetBehavior.from(binding.cardView) + bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN } override fun onMarkerClick(marker: Marker?): Boolean { Log.d(kTag, "onMarkerClick: ${marker?.options?.title}") + // 显示 CardView + bottomSheetBehavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED marker?.apply { infoWindow = if (this.options.title.toString().startsWith("AQS")) { LayoutInflater.from(context).inflate(R.layout.popup_safety_tree_info, null) diff --git a/app/src/main/res/layout/activity_site_tab.xml b/app/src/main/res/layout/activity_site_tab.xml index ba0e385..522cabe 100644 --- a/app/src/main/res/layout/activity_site_tab.xml +++ b/app/src/main/res/layout/activity_site_tab.xml @@ -94,12 +94,13 @@ android:layout_height="match_parent" />