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 90a49ff..db25c40 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 @@ -145,21 +145,21 @@ override fun onMarkerClick(marker: Marker?): Boolean { val inflater = LayoutInflater.from(context) - marker?.apply { - Log.d(kTag, "onMarkerClick: $snippet") + marker?.let { + Log.d(kTag, "onMarkerClick: $${it.snippet}") /** * title: 072024010004 * snippet: 1 * */ - if (snippet.startsWith("1")) { + if (it.snippet.startsWith("1")) { infoWindow = inflater.inflate(R.layout.popup_safety_tree_info, null) - clickedMarker = this - if (isInfoWindowShown) { - hideInfoWindow() + clickedMarker = it + if (it.isInfoWindowShown) { + it.hideInfoWindow() } else { - showInfoWindow() + it.showInfoWindow() } - } else if (snippet.startsWith("6")) { + } else if (it.snippet.startsWith("6")) { // 显示 CardView ,不显示 InfoWindow bottomSheetBehavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED @@ -226,11 +226,11 @@ ) } else { infoWindow = inflater.inflate(R.layout.popup_worker_info, null) - clickedMarker = this - if (isInfoWindowShown) { - hideInfoWindow() + clickedMarker = it + if (it.isInfoWindowShown) { + it.hideInfoWindow() } else { - showInfoWindow() + it.showInfoWindow() } } } @@ -238,23 +238,23 @@ } override fun onMapClick(p0: LatLng?) { - clickedMarker?.apply { - if (isInfoWindowShown) { - hideInfoWindow() + clickedMarker?.let { + if (it.isInfoWindowShown) { + it.hideInfoWindow() } } } override fun getInfoWindow(marker: Marker?): View? { - marker?.apply { + marker?.let { /** * title: 072024010004 * snippet: 1 * */ - if (snippet.startsWith("1")) { - renderSafetyTreeWindow(this, infoWindow!!) + if (it.snippet.startsWith("1")) { + renderSafetyTreeWindow(it, infoWindow!!) } else { - renderWorkerWindow(this, infoWindow!!) + renderWorkerWindow(it, infoWindow!!) } } return infoWindow @@ -316,8 +316,8 @@ } override fun onInfoWindowClick(marker: Marker?) { - marker?.apply { - if (snippet.startsWith("HW")) { + marker?.let { + if (it.snippet.startsWith("HW")) { AlertControlDialog.Builder() .setContext(context) .setTitle("视频通话") @@ -327,7 +327,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - navigatePageTo(snippet) + navigatePageTo(it.snippet) } override fun onCancelClick() {}