diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt index 624477723d..971e7b2af2 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt +++ b/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()) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index f22ffd93a5..763e91b5f1 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/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 ) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 7486d917f1..0aaa533b50 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/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() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index de3da3b4da..8ab5d63bac 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/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" /> diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt index b2400ffa9a..dd01df2f90 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt +++ b/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" } } } diff --git a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d index 55c7942ec7..da40d786d6 100644 Binary files a/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d and b/core/mogo-core-res/src/main/res/raw/chuzuche.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d b/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d index 3802f3e5ec..077e95347c 100644 Binary files a/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d and b/core/mogo-core-res/src/main/res/raw/hq_h9.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/huanwei.nt3d b/core/mogo-core-res/src/main/res/raw/huanwei.nt3d index 85be9ec991..b50ce19e16 100644 Binary files a/core/mogo-core-res/src/main/res/raw/huanwei.nt3d and b/core/mogo-core-res/src/main/res/raw/huanwei.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d b/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d index f905999156..c9eaa70c2a 100644 Binary files a/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d and b/core/mogo-core-res/src/main/res/raw/xiaobache.nt3d differ diff --git a/gradle.properties b/gradle.properties index bf2c8e49b7..95037549ea 100644 --- a/gradle.properties +++ b/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 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index db7f17f988..6924f0926f 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/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 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 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