[map-sdk]地图版本3.3.3.7

This commit is contained in:
wangyanjun
2023-12-26 14:19:04 +08:00
parent ae9fabf854
commit 73c6d61133
355 changed files with 786 additions and 108 deletions

View File

@@ -1025,6 +1025,10 @@ class MapEngine {
setStyleName("night")
else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR)
setStyleName("day")
else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR_BUS)
setStyleName("bus_day")
else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR_TAXI)
setStyleName("taxi_day")
}
private external fun loadJni(projectDir: String, mapView: MapView?,assetManager: AssetManager?): Long

View File

@@ -596,7 +596,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
}
if (isRenderFirst) {
isRenderFirst = false
if(mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_NIGHT_VR || mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_DAY_VR) {
if(mMapStyleParams.getStyleMode() >= MapAutoApi.MAP_STYLE_NIGHT_VR) {
mMapController?.setMapViewVisualAngle(mMapStyleParams.getVrAngleDefaultMode())
}
mHandler.sendEmptyMessage(INIT_COMPLETE)
@@ -729,7 +729,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
mMapEngine.setScreenToOriginDis(mMapStyleParams.getCarPosition())
if (mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_NIGHT_VR || mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_DAY_VR) {
if (mMapStyleParams.getStyleMode() >= MapAutoApi.MAP_STYLE_NIGHT_VR) {
if (DEBUG) {
Log.i(TAG, "mapop-surfaceop----onSurfaceCreated,Vr")
}
@@ -779,7 +779,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
return true
}
if (isCanZoom) {
if(mMapStyleParams.isSwitchViewAngle() && (mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_NIGHT_VR || mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_DAY_VR)){
if(mMapStyleParams.isSwitchViewAngle() && (mMapStyleParams.getStyleMode() >= MapAutoApi.MAP_STYLE_NIGHT_VR)){
var type = mMapStyleParams.getVrAngleDefaultMode()
when(mMapStyleParams.getVrAngleMode()){
mMapStyleParams.getVrAngleDefaultMode()->{
@@ -1083,13 +1083,13 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
private var isScroll = true
//可以斜滑
private var isFling = false
private var isFling = true
//可以旋转
private var isRotate = false
private var isRotate = true
//可以缩放
private var isCanZoom = false
private var isCanZoom = true
private var isVr = true
@@ -1151,10 +1151,10 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
}
fun onMapFocusChanging() {
// if (DEBUG) {
// Log.i(TAG, "mapop--onMapFocusChanging")
// }
// mHandler.sendEmptyMessage(FOCUS_CHANGE)
if (DEBUG) {
Log.i(TAG, "mapop--onMapFocusChanging")
}
mHandler.sendEmptyMessage(FOCUS_CHANGE)
}
fun onMapZoomChanging(zoomIndex: Float) {
@@ -1168,23 +1168,23 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
}
fun onMapRAngleChanging(angle:Float) {
// if (DEBUG) {
// Log.i(TAG, "mapop--onMapRAngleChanging")
// }
// val msg = Message.obtain()
// msg.what = ROTATE_CHANGE
// msg.obj = angle
// mHandler.sendMessage(msg)
if (DEBUG) {
Log.i(TAG, "mapop--onMapRAngleChanging:${angle}")
}
val msg = Message.obtain()
msg.what = ROTATE_CHANGE
msg.obj = angle
mHandler.sendMessage(msg)
}
fun onMapDAngleChanging(angle:Float) {
// if (DEBUG) {
// Log.i(TAG, "mapop--onMapDAngleChanging:${angle}")
// }
// val msg = Message.obtain()
// msg.what = DAngle_CHANGE
// msg.obj = angle
// mHandler.sendMessage(msg)
if (DEBUG) {
Log.i(TAG, "mapop--onMapDAngleChanging:${angle}")
}
val msg = Message.obtain()
msg.what = DAngle_CHANGE
msg.obj = angle
mHandler.sendMessage(msg)
}
override fun loadP(