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 ac0964f..63595df 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 @@ -148,7 +148,7 @@ //计算所有点的中心点位置 val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) //移动到指定经纬度 - val cameraPosition = CameraPosition(centerLatLng, 18f, 0f, 0f) + val cameraPosition = CameraPosition(centerLatLng, aMap.maxZoomLevel, 0f, 0f) val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate) } @@ -164,7 +164,7 @@ val location = x.latestLocation if (location.gdLat.isNotBlank() && location.gdLng.isNotBlank()) { val latitude = location.gdLat.toDouble() - val longitude = location.gdLat.toDouble() + val longitude = location.gdLng.toDouble() latitudeList.add(latitude) longitudeList.add(longitude) @@ -186,12 +186,6 @@ allMarkerOptions.add(options) } } - //计算所有点的中心点位置 - val centerLatLng = LatLng(latitudeList.average(), longitudeList.average()) - //移动到指定经纬度 - val cameraPosition = CameraPosition(centerLatLng, 18f, 0f, 0f) - val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(cameraUpdate) allMarkerOptions.forEach { marker -> aMap.addMarker(marker)