diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/iv_roma_bus_passenger_press_bg.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable/iv_roma_bus_passenger_press_bg.png new file mode 100644 index 0000000000..a0b2ab93d9 Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/main/res/drawable/iv_roma_bus_passenger_press_bg.png differ diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/roma_bus_p_bg_selector.xml b/OCH/mogo-och-bus-passenger/src/main/res/drawable/roma_bus_p_bg_selector.xml new file mode 100644 index 0000000000..191ec2e51f --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/main/res/drawable/roma_bus_p_bg_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index f01a26e184..88e7cb8ee6 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -62,7 +62,9 @@ android:layout_height="@dimen/dp_121" android:layout_marginRight="@dimen/dp_751" android:layout_marginBottom="@dimen/dp_59" - android:background="@drawable/iv_roma_bus_passenger_bg" + android:background="@drawable/roma_bus_p_bg_selector" + app:roma_close="@drawable/roma_bus_p_bg_selector" + app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_roma_taxi_passenger_press_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_roma_taxi_passenger_press_bg.png new file mode 100644 index 0000000000..59c45b7c18 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_roma_taxi_passenger_press_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml new file mode 100644 index 0000000000..05c96dc351 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 1c159a3073..2f500e2afb 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -59,8 +59,10 @@ android:layout_height="100dp" android:layout_marginStart="@dimen/dp_557" android:layout_marginBottom="50dp" - android:background="@drawable/iv_roma_passenger_bg" + android:background="@drawable/roma_taxi_p_bg_selector" app:layout_constraintBottom_toBottomOf="parent" + app:roma_close="@drawable/roma_taxi_p_bg_selector" + app:roma_open="@drawable/iv_roma_taxi_passenger_press_bg" app:layout_constraintLeft_toLeftOf="parent" /> { romaMode = true + if(openRes != 0){ + setBackgroundResource(openRes) + } } "1" -> { romaMode = false + if(normalRes != 0){ + setBackgroundResource(normalRes) + } } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 4e1a2e3835..383366edc9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -80,4 +80,8 @@ + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt index 8dbc7b4d82..b0789fcd00 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt @@ -65,10 +65,10 @@ object TrackerSourceFilterHelper { //僵尸车 if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){ - color = "#AD7488FF" + color = "#7A8499FF" CallerMapUIServiceManager.getMapUIController()?.let { if(it.isDayMode){ - color = "#AE7887FF" + color = "#9BA8BCFF" } } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt index ec12f3c319..81f546cb3d 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt @@ -46,7 +46,7 @@ object WarningHelper { mMarkersCaches[trackId] ?: return@Consumer if (planningObj.type == 0) { //0是leading障碍物，障碍物车身红色提示 pncWarningBeautyTrafficData[trackId] = PlanningTrack( - "#FF0000FF", + "#D65D5AFF", getCurWgs84SatelliteTime() ) } else if (planningObj.type == 1) { //1是避障和择机的障碍物，障碍物车身黄色提示 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 13f4196b64..4cb442099e 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 @@ -115,6 +115,8 @@ public class AMapWrapper implements IMogoMap { } } + BatchMarkerOptions batchMarkerOptions = new BatchMarkerOptions(); + @SuppressLint("NewApi") @Override public void updateBatchMarkerPosition(HashMap optionsArrayList) { @@ -135,18 +137,17 @@ public class AMapWrapper implements IMogoMap { return; } long time = markerOptionsArrayList.get(0).getTime(); - ArrayList list = new ArrayList(markerOptionsArrayList); - BatchMarkerOptions batchMarkerOptions = new BatchMarkerOptions(); - batchMarkerOptions.list = list; + 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); -// MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1); } + BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions(); + @SuppressLint("NewApi") @Override public void updateBatchAiMarkerPosition(HashMap optionsArrayList) { @@ -162,7 +163,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