[map-sdk]地图版本3.3.0.10
This commit is contained in:
@@ -2,6 +2,7 @@ package com.autonavi.nge.map
|
||||
|
||||
import android.content.res.AssetManager
|
||||
import android.util.Log
|
||||
import com.zhidaoauto.map.sdk.open.MapAutoApi
|
||||
|
||||
class MapEngine {
|
||||
|
||||
@@ -1014,6 +1015,17 @@ class MapEngine {
|
||||
setTextureJni(mObj,name,ba)
|
||||
}
|
||||
}
|
||||
fun setStyleName(name:String){
|
||||
if (mObj != 0L) {
|
||||
setPainterCmdJni(mObj,"style",name)
|
||||
}
|
||||
}
|
||||
fun onChangeStyle(styleMode:Int){
|
||||
if(styleMode== MapAutoApi.MAP_STYLE_NIGHT_VR)
|
||||
setStyleName("night")
|
||||
else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR)
|
||||
setStyleName("day")
|
||||
}
|
||||
private external fun loadJni(projectDir: String, mapView: MapView?,assetManager: AssetManager?): Long
|
||||
|
||||
private external fun resizeJni(obj:Long,newWidth: Int, newHeight: Int)
|
||||
|
||||
@@ -149,7 +149,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
|
||||
mHandler = object : Handler(mapViewThread.looper) {
|
||||
override fun handleMessage(msg: Message) {
|
||||
when (msg.what) {
|
||||
ZOOM_CHANGE -> mMapController?.dispatchZoomChanged()
|
||||
ZOOM_CHANGE -> mMapController?.dispatchZoomChanged(msg.obj as Float)
|
||||
// ROTATE_CHANGE ->mMapController?.dispatchRotationAngleChanged((msg.obj as Float))
|
||||
// DAngle_CHANGE -> mMapController?.dispatchDAngleChanged()
|
||||
// FOCUS_CHANGE -> mMapController?.dispatchFocusChanged()
|
||||
@@ -183,41 +183,8 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
|
||||
}
|
||||
}
|
||||
|
||||
// private val Hndler: Handler = object : Handler(Looper.getMainLooper()) {
|
||||
// override fun handleMessage(msg: Message) {
|
||||
// when (msg.what) {
|
||||
// ZOOM_CHANGE -> mMapController?.dispatchZoomChanged()
|
||||
// ROTATE_CHANGE ->mMapController?.dispatchRotationAngleChanged((msg.obj as Float))
|
||||
// DAngle_CHANGE -> mMapController?.dispatchDAngleChanged()
|
||||
// FOCUS_CHANGE -> mMapController?.dispatchFocusChanged()
|
||||
// RENDER_CHANGE -> {
|
||||
// mEventController?.dispatchRenderListener(msg.arg1)
|
||||
// }
|
||||
// RENDER_COMPLETE -> {
|
||||
// if (DEBUG) {
|
||||
// Log.i(TAG, "mapop--load render complete-start")
|
||||
// }
|
||||
//// CommonEventController.instance?.dispatchCameraChangeFinishListener(CommonController.instance.mapAutoView?.getMapAutoViewHelper()?.getCameraPosition() ?: null)
|
||||
// if (DEBUG) {
|
||||
// Log.i(TAG, "mapop--load render complete-end")
|
||||
// }
|
||||
// }
|
||||
// LOAD_COMPLETE -> {
|
||||
// if (DEBUG) {
|
||||
// Log.i(TAG, "mapop--load complete-start")
|
||||
// }
|
||||
// mEventController?.dispatchMapLoadedListener()
|
||||
// }
|
||||
//
|
||||
// INIT_COMPLETE -> {
|
||||
// if (DEBUG) {
|
||||
// Log.i(TAG, "mapop--init complete-start")
|
||||
// }
|
||||
// mEventController?.dispatchMapLoadedInitListener()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
|
||||
override fun getMapEngine(): MapEngine {
|
||||
return mMapEngine
|
||||
@@ -747,6 +714,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
|
||||
// setStyleDir("sdcard/shmdata/style")
|
||||
val styleMode = mMapStyleParams.getStyleMode()
|
||||
val dir = Constant.nDSDataPath
|
||||
|
||||
if(!loadP(dir)){
|
||||
return
|
||||
}
|
||||
@@ -1115,13 +1083,13 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
|
||||
private var isScroll = true
|
||||
|
||||
//可以斜滑
|
||||
private var isFling = true
|
||||
private var isFling = false
|
||||
|
||||
//可以旋转
|
||||
private var isRotate = true
|
||||
private var isRotate = false
|
||||
|
||||
//可以缩放
|
||||
private var isCanZoom = true
|
||||
private var isCanZoom = false
|
||||
|
||||
private var isVr = true
|
||||
|
||||
@@ -1189,11 +1157,14 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
|
||||
// mHandler.sendEmptyMessage(FOCUS_CHANGE)
|
||||
}
|
||||
|
||||
fun onMapZoomChanging() {
|
||||
fun onMapZoomChanging(zoomIndex: Float) {
|
||||
if (DEBUG) {
|
||||
Log.i(TAG, "mapop--onMapZoomChanging")
|
||||
Log.i(TAG, "mapop--onMapZoomChanging--:${zoomIndex}")
|
||||
}
|
||||
mHandler.sendEmptyMessage(ZOOM_CHANGE)
|
||||
val msg = Message.obtain()
|
||||
msg.what = ZOOM_CHANGE
|
||||
msg.obj = zoomIndex
|
||||
mHandler.sendMessage(msg)
|
||||
}
|
||||
|
||||
fun onMapRAngleChanging(angle:Float) {
|
||||
@@ -1206,11 +1177,14 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
|
||||
// mHandler.sendMessage(msg)
|
||||
}
|
||||
|
||||
fun onMapDAngleChanging() {
|
||||
fun onMapDAngleChanging(angle:Float) {
|
||||
// if (DEBUG) {
|
||||
// Log.i(TAG, "mapop--onMapDAngleChanging")
|
||||
// Log.i(TAG, "mapop--onMapDAngleChanging:${angle}")
|
||||
// }
|
||||
// mHandler.sendEmptyMessage(DAngle_CHANGE)
|
||||
// val msg = Message.obtain()
|
||||
// msg.what = DAngle_CHANGE
|
||||
// msg.obj = angle
|
||||
// mHandler.sendMessage(msg)
|
||||
}
|
||||
|
||||
override fun loadP(
|
||||
|
||||
Reference in New Issue
Block a user