Commit fbb79620 authored by wanglei's avatar wanglei

...

parent 641b378a
...@@ -82,7 +82,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -82,7 +82,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
if (currentViewingBean != viewingBean) { if (currentViewingBean != viewingBean) {
removeOldViewingMarker() removeOldViewingMarker()
currentViewingBean = viewingBean currentViewingBean = viewingBean
setViewingBeanMarker() setViewingBeanMarker(15f)
} }
startGetLocationJob() startGetLocationJob()
...@@ -266,7 +266,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -266,7 +266,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
} }
} }
private fun setViewingBeanMarker() { private fun setViewingBeanMarker(zoom: Float? = null) {
currentViewingBean?.let { viewingBean -> currentViewingBean?.let { viewingBean ->
viewingBean.locatDate?.let { locatDate -> viewingBean.locatDate?.let { locatDate ->
...@@ -278,7 +278,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -278,7 +278,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
friendMarker = map?.addLocationMarker(friendAvatar, latLng, viewingBean.nickname) friendMarker = map?.addLocationMarker(friendAvatar, latLng, viewingBean.nickname)
} }
setViewBeanLocation(latLng) setViewBeanLocation(latLng, zoom)
} }
} }
} }
...@@ -288,8 +288,10 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -288,8 +288,10 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
friendMarker = null friendMarker = null
} }
private fun setViewBeanLocation(latLng: LatLng) { private fun setViewBeanLocation(latLng: LatLng, zoom: Float? = null) {
map?.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 15f)) zoom?.let {
map?.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, it))
}
myMarker?.position = latLng myMarker?.position = latLng
} }
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
class="com.google.android.gms.maps.SupportMapFragment" class="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="FragmentTagUsage" /> tools:ignore="FragmentTagUsage" />
<ImageView <ImageView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment