Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl

@@ -111,10 +111,10 @@ void setLeadLine(){
 }
 void setSignalLine(){
     if(signalLineObj==1 && signalLineStep>0){
-        _uv.x = (uv.x - 0.5)*signalScale + 0.5; //x方向缩放
+        _uv.x = uv.x;
         _uv.y = uv.y;
         signalLineTexY = _uv.y;
-        _uv = _uv + vec2(0.0,1.0)*signalLineTime;
+        _uv = _uv + vec2(0.0,1.0);
     }
 }
 void setGuideLine(){

libraries/mapmodule/src/main/java/com/autonavi/nge/dm/NavigationCore.java

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

libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/GuidanceProvider.java

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

libraries/mapmodule/src/main/java/com/autonavi/nge/hdmap/HDMapProvider.kt

@@ -10,11 +10,88 @@ class HDMapProvider {
         /**f:设置redis源。1,测试redis（42）。非1，正式redis（根据域名访问的）。默认,非1 */
         @JvmStatic external fun setDataRedisSource(source: Int)
 
+        /** 是否开启地图数据调试信息的展示*/
+        @JvmStatic external fun toggleMapDataDebugInfo(open: Boolean)
+
+        /** 是否开启Systrace*/
+        @JvmStatic external fun toggleSystrace(open: Boolean)
+
+        /**
+         * 设置Redis数据加载回调
+         */
+        @JvmStatic external fun setRedisDataLoadCallback(callback: IRedisLoadCallback)
+
         init {
             System.loadLibrary("hdmap")
         }
     }
 
+    interface IRedisLoadCallback {
+        /**
+         *  登录开始
+         */
+        fun onLoginStart(ip: String, port: Int, password: String, dbIndex: Int) { }
+
+        /**
+         * 登录失败
+         */
+        fun onLoginFailed(error: String?) { }
+
+        /**
+         * 登录成功
+         */
+        fun onLoginSuccess() { }
+
+        /**
+         * 登录成功之后，重新开始登录
+         * @param isCanRetry: true -> 可以再次重试; false-> 不可以再次重试
+         */
+        fun onReLogin(isCanRetry: Boolean) { }
+
+        /**
+         * 请求 加载指定瓦片数据 开始
+         * @param layerId: redis中指哈希表中的键
+         * @param tileId: 要获取的指定瓦片ID的数据
+         */
+        fun onTileLoadStart(layerId: String, tileId: String) { }
+
+        /**
+         * 请求加载瓦片数据成功
+         * @param layerId: redis中指哈希表中的键
+         * @param tileId: 要获取的指定瓦片ID的数据
+         */
+        fun onTileLoadSuccess(layerId: String, tileId: String) { }
+
+        /**
+         * 请求加载瓦片数据失败
+         * @param layerId: redis中指哈希表中的键
+         * @param tileId: 要获取的指定瓦片ID的数据
+         */
+        fun onTileLoadFail(layerId: String, tileId: String, error: String) { }
+
+        /**
+         * 请求同时加载多个瓦片数据开始
+         * @param layerId: redis中指哈希表中的键
+         * @param tileIds: 要获取的指定瓦片ID列表的集合
+         */
+        fun onTilesLoadStart(layerId: String, tileIds: List<String>) { }
+
+        /**
+         * 同时加载多个瓦片数据成功
+         * @param layerId: redis中指哈希表中的键
+         * @param tileIds: 要获取的指定瓦片ID列表的集合
+         */
+        fun onTilesLoadSuccess(layerId: String, tileIds: List<String>) { }
+
+        /**
+         * 同时加载多个瓦片数据失败
+         * @param layerId: redis中指哈希表中的键
+         * @param tileIds: 要获取的指定瓦片ID列表的集合
+         * @param error: 加载失败的异常信息
+         */
+        fun onTilesLoadFail(layerId: String, tileIds: List<String>, error: String?) { }
+    }
+
     fun getLaneCenterLine(tileId: Int, routeId: Int): ArrayList<HDMapBlock>? {
         return if (mObj != 0L) {
             getLaneCenterLineJni(mObj, tileId, routeId)

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMarkerController.kt

@@ -27,7 +27,7 @@ interface IMarkerController {
     /**
      * 批量更新他车
      */
-    fun updateBatchMarkerPositon(batchMarkerOptions: com.zhidaoauto.map.sdk.open.renders.marker.BatchMarkerOptions)
+    fun updateBatchMarkerPositon(batchMarkerOptions: BatchMarkerOptions)
     //根据车辆类型预添加车辆模型
     fun addPreVehicleModel(type:Int,modelRes:Int):String?
     //添加普通模型

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt

@@ -93,6 +93,9 @@ class RoadHelper private constructor() {
         cacheHdDataProgressJob?.cancel()
         cacheHdDataProgressJob = null
 
+        mHdDataDownloadListener?.clear()
+        mHdDataDownloadListener = null
+
         cancelCacheHDData()
 
         hdMapProvider.release()

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/renders/marker/MarkerSimpleData.kt

@@ -26,6 +26,8 @@ class MarkerSimpleData {
     var color: String = ""
     //颜色设置类型 0 直接替换 1=由原色变为指定色 有方向  * 2=由指定色变为原色 有方向  * 3=由原色变为指定色 无方向 * 4=由指定色变为原色 无方向
     var colorType: Int = 0
+    // 变色角度
+    var colorAngle:Int = 0
     //文本
     var text: String = ""
     //状态

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt

@@ -341,16 +341,17 @@ open class MapAutoView : FrameLayout, LonLatPointListener, ITraffic,ILockLocatio
                 mEventController = MapEventController()
             }
 
-            mMapView?.let {
+            mMapView?.let { itx ->
                 if (CompileConfig.DEBUG) {
                     Log.i(TAG, "autoop-mapop-create--${mMapView}")
                 }
-                it.setEventController(mEventController)
-                addView(it)
+                itx.setEventController(mEventController)
+                addView(itx)
 
+                Log.d(TAG, "--- controller assign -->")
                 mMapController =
-                    MapController(context, it, this@MapAutoView, mEventController, mMapStyleParams)
-
+                    MapController(context, itx, this@MapAutoView, mEventController, mMapStyleParams)
+                locationClient?.takeIf { it.mMapController == null }?.also { it.mMapController = mMapController }
                 mMapController?.let { mapController ->
                     mMarkerController = MarkerController(mapController)
                     mapController.setMarkerController(mMarkerController)
@@ -358,8 +359,8 @@ open class MapAutoView : FrameLayout, LonLatPointListener, ITraffic,ILockLocatio
                 mLocationView = LocationHelper(context, mMarkerController, mMapController,mMapStyleParams)
                 mMapController?.setLocalView(mLocationView)
 
-                it.setMapController(mMapController)
-                it.mITraffic = this@MapAutoView
+                itx.setMapController(mMapController)
+                itx.mITraffic = this@MapAutoView
                 // init PanelManager
                 mPanelManager = PanelManager(this@MapAutoView, context, mMapController)
             }

libraries/mogo-map/build.gradle

@@ -51,8 +51,7 @@ dependencies {
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
     // 高精地图
-//    implementation rootProject.ext.dependencies.mogocustommap
-    implementation project(':libraries:mapmodule')
+    implementation rootProject.ext.dependencies.mogocustommap
 
     // 高德地图
     api rootProject.ext.dependencies.amapnavi3dmap