[map-sdk]merge地图版本 3.2.1.4

This commit is contained in:
jiaguofeng
2023-11-10 11:18:23 +08:00
parent dbaca9cafb
commit a4c1c25fb0
20 changed files with 188 additions and 27 deletions

View File

@@ -62,6 +62,8 @@ class MapBox {
external fun cancelTask()
external fun llaRelease()
external fun isInRoadSideFenceRegion(lon: Double, lat: Double, isCancel: Boolean = false)
fun resultCallbackByteStream(key: String?, result: ByteArray?) {
if (DEBUG) {
// Log.d(TAG, "roadop--resultCallbackDouble: " +"key:" + key + " + " result:"+ result.length);

View File

@@ -1,4 +1,4 @@
//package com.autonavi.nge.dm;
package com.autonavi.nge.dm;//package com.autonavi.nge.dm;
//
//import android.os.RemoteException;
//import android.util.Log;

View File

@@ -50,7 +50,6 @@ public class SharedMemoryService {
private void init(Context context) {
HDMapProvider.setDataFileSource(MapHelper.INSTANCE.getMMapParams().getDataFileSource());
HDMapProvider.setDataRedisSource(MapHelper.INSTANCE.getMMapParams().getDataRedisFileSource());
if (!TextUtils.isEmpty(MapHelper.INSTANCE.getMMapParams().getHdMapPath())) {
HDMapProvider.setDataDir(MapHelper.INSTANCE.getMMapParams().getHdMapPath());
@@ -65,6 +64,7 @@ public class SharedMemoryService {
Log.i(TAG, "autoop-dir:" + dir+",SharedMemory--cachePath:"+cachePath);
}
initSharedMemory_Native(dir,MapHelper.INSTANCE.getMMapParams().getStyleDir(),cachePath,MapHelper.INSTANCE.getMMapParams().getQZoneFilterArray());
HDMapProvider.setDataFileSource(MapHelper.INSTANCE.getMMapParams().getDataFileSource());
}

View File

@@ -1,4 +1,4 @@
//package com.autonavi.nge.guidance;
package com.autonavi.nge.guidance;//package com.autonavi.nge.guidance;
//
//import android.util.Log;
//

View File

@@ -713,10 +713,10 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
// setStyleDir("sdcard/shmdata/style")
val styleMode = mMapStyleParams.getStyleMode()
val dir = Constant.nDSDataPath
mMapEngine.setIsEnableShadow(mMapStyleParams.isShadowEnable())
if(!loadP(dir)){
return
}
mMapEngine.setIsEnableShadow(mMapStyleParams.isShadowEnable())
loadOverCallbak()
if(mMapStyleParams.getHDVisibileArray().isNotEmpty()){
mMapEngine.setHDTypeVisibile(mMapStyleParams.getHDVisibileArray())
@@ -975,7 +975,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
//Marker Event
markerEvent(e)
if (mEventController?.isMarkClickListenerListEmpty() == false) {
if (mEventController?.isMapClickListenerListEmpty() == false) {
val x = e.x.toInt()
val y = e.y.toInt()
val latLonPoint = MapTools.fromScreenLocation(Point(x, y),mMapController)