Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

This commit is contained in:
squallzhjch
2023-08-17 17:38:10 +08:00
7 changed files with 75 additions and 18 deletions

View File

@@ -1030,7 +1030,7 @@ class MainActivity : BaseActivity() {
*/
private fun showMainActivityBottomSheetGroup() {
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 60)
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 256, 60)
mapController.mMapView.vtmMap.animator().animateTo(
GeoPoint(
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
@@ -1044,7 +1044,7 @@ class MainActivity : BaseActivity() {
*/
private fun hideMainActivityBottomSheetGroup() {
binding.mainActivityBottomSheetGroup.visibility = View.GONE
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 0)
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 256, 0)
mapController.mMapView.vtmMap.animator().animateTo(
GeoPoint(
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,

View File

@@ -457,7 +457,7 @@ class MainViewModel @Inject constructor(
withContext(Dispatchers.Main) {
if (Constant.AUTO_LOCATION) {
mapController.mMapView.vtmMap.animator()
.animateTo(GeoPoint(location.longitude, location.latitude))
.animateTo(GeoPoint(location.latitude, location.longitude))
}
}
}
@@ -501,11 +501,8 @@ class MainViewModel @Inject constructor(
val linkList = realmOperateHelper.queryLink(point = point)
/*val linkList = realmOperateHelper.queryLine(
/* val linkList = realmOperateHelper.queryLine(
point = point,
)
// val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE")
buffer = 2.5,
table = "OMDB_LANE_MARK_BOUNDARYTYPE"
)*/