地图模块适配

This commit is contained in:
jiaguofeng
2023-08-11 14:51:19 +08:00
parent 661816af8f
commit 74c0a81e68
30 changed files with 452 additions and 674 deletions

View File

@@ -113,8 +113,8 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
// 地图POI是否允许点击。
private var mPoiTouchEnable = true
private var viewWidth = 1920
private var viewHeight = 1040
private var mViewWidth = 1920
private var mViewHeight = 1040
var mLonLat: LonLat? = null
private val ZOOM_CHANGE = 0x7F
private val FOCUS_CHANGE = 0x9F
@@ -123,6 +123,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
private val RENDER_COMPLETE = 0x15F
private val LOAD_COMPLETE = 0x17F
private val RENDER_CHANGE = 0x19F
private val INIT_COMPLETE = 0x21F
private val LISTENER_TYPE_SCREEN = 0x5F
private val DELAY_TIME: Long = 500
private val VELOCITY_MEASURE: Float = 3000f
@@ -183,6 +184,13 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
// CommonController.instance.naviAutoView?.mNaviViewListener?.onNaviViewLoaded()
}
INIT_COMPLETE -> {
if (DEBUG) {
Log.i(TAG, "mapop--init complete-start")
}
mEventController?.dispatchMapLoadedInitListener()
}
else -> {
}
}
@@ -628,7 +636,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
if(mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_NIGHT_VR || mMapStyleParams.getStyleMode() == MapAutoApi.MAP_STYLE_DAY_VR) {
mMapController?.setMapViewVisualAngle(mMapStyleParams.getDefaultPerspective())
}
mEventController?.dispatchMapLoadedInitListener()
mHandler.sendEmptyMessage(INIT_COMPLETE)
if(DEBUG){
Log.i(TAG, "mapop-surfaceop--onDrawFramethreadop:${Thread.currentThread().id}")
}
@@ -658,14 +666,14 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
if (DEBUG) {
Log.i(TAG, "mapop--surfaceop--resize:${width},${height}")
}
if (width == 0 || height == 0 || (viewWidth == width && viewHeight == height)) {
if (width == 0 || height == 0 || (mViewWidth == width && mViewHeight == height)) {
return
}
// gl.glViewport(0, 0, width, height)
viewWidth = width
viewHeight = height
MapTools.viewHeight = viewWidth
MapTools.viewWidth = viewHeight
mViewWidth = width
mViewHeight = height
MapTools.viewHeight = mViewWidth
MapTools.viewWidth = mViewHeight
if (DEBUG) {
Log.i(TAG, "mapop--surfaceop--resize:${width},${height}")
}
@@ -1129,6 +1137,14 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
return isTouchingFlag
}
override fun getViewWidth(): Int{
return mViewWidth
}
override fun getViewHeight(): Int{
return mViewHeight
}
override fun isCanZoom(): Boolean {
return isCanZoom
}
@@ -1232,10 +1248,6 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
mStylePath = path
}
override fun resizeP(w: Int, h: Int) {
mMapEngine.resize(w, h)
}
override fun renderP() {
mMapEngine.render()
}
@@ -1324,7 +1336,6 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
init {
System.loadLibrary("map")
System.loadLibrary("common")
}
init {