同步3.1.0修改

This commit is contained in:
jiaguofeng
2023-09-01 19:47:54 +08:00
parent 43f99b3043
commit 62257acf05
40 changed files with 899 additions and 593 deletions

View File

@@ -4,5 +4,5 @@ public class Common {
static {
System.loadLibrary("common");
}
public native void setCfgKeyVal(String key, String val);
// public native void setCfgKeyVal(String key, String val);
}

View File

@@ -1,8 +1,5 @@
package com.autonavi.nge;
import android.util.Log;
import com.zhidaoauto.map.sdk.inner.CompileConfig;
import com.zhidaoauto.map.sdk.inner.road.RoadResultController;
@@ -21,7 +18,7 @@ public class MapBox {
public native void llaGetTrafficLight(double dLon, double dLat, float fAngle);
public native void llaMergedRoadRect(double dLon, double dLat, float fAngle);
public native void llaGetRoadLimitSpeed(double dLon, double dLat, float fAngle);
public native void llaGetCenterLineRange(double dLon, double dLat, float fAngle,float fDis);
public native void llaGetCenterLineRange(double dLon, double dLat, float fAngle,float fDis,boolean isSmooth,int orders);
public native void llaGetRoadName(double dLon, double dLat, float fAngle);
public native void llaGetCenterLineRoadNode(double dLon, double dLat, float fAngle,float fDis);
public native void llaGetCrossRoad(double dLon, double dLat, float fAngle);
@@ -49,12 +46,14 @@ public class MapBox {
public native void llaRelease();
static void resultCallback(String key,String result){
static void resultCallbackByteStream(String key,byte[] result){
if(CompileConfig.INSTANCE.getDEBUG()){
Log.d(TAG, "roadop--resultCallback: " +"key:" + key + " result:" + result);
// Log.d(TAG, "roadop--resultCallbackDouble: " +"key:" + key + " + " result:"+ result.length);
}
if (result == null || result.length < 1) {
return;
}
RoadResultController.getInstance().dispatchRoadResult(0,key,result);
}
}

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

@@ -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

@@ -985,6 +985,12 @@ class MapEngine {
}
}
fun setCfgKeyVal(key: String?, value: String?) {
if(mObj != 0L){
setCfgKeyValJni(mObj,key,value)
}
}
fun unload() {
Log.i(TAG, "MapEngine: unload")
if (mObj != 0L) {
@@ -992,7 +998,22 @@ class MapEngine {
mObj = 0
}
}
fun setLightWave(da:DoubleArray){
if (mObj != 0L) {
setLightWaveJni(mObj,da)
}
}
fun setGuideLine(da:DoubleArray?){
if (mObj != 0L) {
setGuideLineJni(mObj,da)
}
}
fun setTexture(name: String,ba:ByteArray?){
if (mObj != 0L) {
setTextureJni(mObj,name,ba)
}
}
private external fun loadJni(projectDir: String, mapView: MapView?,assetManager: AssetManager?): Long
private external fun resizeJni(obj:Long,newWidth: Int, newHeight: Int)
@@ -1595,9 +1616,14 @@ class MapEngine {
color: FloatArray
)
private external fun setCfgKeyValJni(obj: Long,key: String?,value: String?)
private external fun clearAllPrimitivesJni(obj: Long): Boolean
private external fun drawDeadZoneJni(obj: Long,strJsonOption: String?)
private external fun setDeadZoneVisiableJni(obj:Long,b: Boolean)
private external fun setLightWaveJni(obj: Long,da:DoubleArray) //光波移动lon1,lat1,lon2,lat2...width,duration
private external fun setGuideLineJni(obj: Long,da:DoubleArray?) //带纹理的引导线
private external fun setTextureJni(obj: Long,name:String,ba:ByteArray?) //设置一些元素的纹理,比如路面("road"),地面("plane")啥的
}