[3.0.0] cherry pick 2.15.0 func of map and fix bug of log

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt

@@ -12,7 +12,6 @@ class AiCloudSocketBizProvider : IMoGoFunctionServerProvider {
         get() = "AiCloudSocketBizProvider"
 
     override fun init(context: Context?) {
-        //todo bus加载
         context?.let {
             SocketManager.getInstance().init(it, 0.0, 0.0)
             SocketManager.getInstance().registerOnMessageListener(401012, V2XMessageListener401012())

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt

@@ -569,7 +569,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.BLACK,
                     -1,
-                    DataSourceType.TELEMATIC
+                    DataSourceType.OBU
                 )
             }
             // 红灯
@@ -578,7 +578,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.RED,
                     red,
-                    DataSourceType.TELEMATIC
+                    DataSourceType.OBU
                 )
             }
             // 绿灯
@@ -587,7 +587,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.GREEN,
                     green,
-                    DataSourceType.TELEMATIC
+                    DataSourceType.OBU
                 )
             }
             // 黄灯
@@ -596,7 +596,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                 CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
                     TrafficLightEnum.YELLOW,
                     yellow,
-                    DataSourceType.TELEMATIC
+                    DataSourceType.OBU
                 )
             }
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -2061,11 +2061,11 @@ internal class DebugSettingView @JvmOverloads constructor(
     }
 
     override fun onLogCatch(lineLog: String) {
-        logInfoView?.let {
-            if (logViewAttach) {
-                it.onLogCatch(lineLog)
-            }
-        }
+//        logInfoView?.let {
+//            if (logViewAttach) {
+//                it.onLogCatch(lineLog)
+//            }
+//        }
     }
 
     private fun restartApp() {

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -1968,6 +1968,7 @@
                         android:layout_margin="2dp"
                         android:padding="@dimen/dp_20"
                         android:gravity="center"
+                        android:visibility="gone"
                         android:textOff="展示日志过滤面板"
                         android:textOn="关闭日志过滤面板"
                         android:textSize="@dimen/dp_24" />

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt

@@ -65,10 +65,10 @@ object TrackerSourceColorHelper {
 
         //僵尸车
         if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){
-            color = "#AD7488FF"
+            color = "#7A8499FF"
             CallerMapUIServiceManager.getMapUIController()?.let {
                 if(it.isDayMode){
-                    color = "#AE7887FF"
+                    color = "#9BA8BCFF"
                 }
             }
         }

gradle.properties

@@ -63,7 +63,7 @@ BIZCONFIG_VERSION=1.3.2
 SERVICE_BIZ_VERSION=1.2.4
 ################  外部依赖引用 ################
 # loglib
-LOGLIB_VERSION=1.5.25
+LOGLIB_VERSION=1.5.26
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
 MOGO_NETWORK_VERSION=1.4.6.6

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java

@@ -23,6 +23,7 @@ import com.mogo.map.utils.ObjectUtils;
 import com.zhidaoauto.map.sdk.open.MapAutoApi;
 import com.zhidaoauto.map.sdk.open.data.MapDataApi;
 import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo;
+import com.zhidaoauto.map.sdk.open.marker.BatchMarkerOptions;
 import com.zhidaoauto.map.sdk.open.marker.Marker;
 import com.zhidaoauto.map.sdk.open.marker.MarkerHelper;
 import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
@@ -114,6 +115,8 @@ public class AMapWrapper implements IMogoMap {
         }
     }
 
+    BatchMarkerOptions batchMarkerOptions = new BatchMarkerOptions();
+
     @SuppressLint("NewApi")
     @Override
     public void updateBatchMarkerPosition(HashMap<String, MessagePad.TrackedObject> optionsArrayList) {
@@ -134,9 +137,17 @@ public class AMapWrapper implements IMogoMap {
             return;
         }
         long time = markerOptionsArrayList.get(0).getTime();
-        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
+        batchMarkerOptions.list = markerOptionsArrayList;
+        batchMarkerOptions.delayStrategy = false;
+        batchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f;
+        batchMarkerOptions.controlIcon = 1;
+        batchMarkerOptions.duration = (int) time;
+        batchMarkerOptions.deleteRule = 1;
+        MarkerHelper.INSTANCE.updateBatchMarkerPositon(batchMarkerOptions);
     }
 
+    BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions();
+
     @SuppressLint("NewApi")
     @Override
     public void updateBatchAiMarkerPosition(HashMap<String, SocketDownData.CloudRoadDataProto> optionsArrayList) {
@@ -158,7 +169,13 @@ public class AMapWrapper implements IMogoMap {
         }
         long time = markerOptionsArrayList.get(0).getTime();
         // 最后一个参数，是否管理锚点的删除
-        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
+        aiBatchMarkerOptions.list = markerOptionsArrayList;
+        aiBatchMarkerOptions.delayStrategy = false;
+        aiBatchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f;
+        aiBatchMarkerOptions.controlIcon = 1;
+        aiBatchMarkerOptions.duration = (int) time;
+        aiBatchMarkerOptions.deleteRule = 1;
+        MarkerHelper.INSTANCE.updateBatchMarkerPositon(aiBatchMarkerOptions);
     }
 
     @Override