From deac094158613f46431b9ea354fadebe9be7bf82 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 13 Apr 2023 15:21:22 +0800 Subject: [PATCH] [2.15.0] roma change and track color change --- .../iv_roma_bus_passenger_press_bg.png | Bin 0 -> 21461 bytes .../res/drawable/roma_bus_p_bg_selector.xml | 8 ++++++++ .../main/res/layout/bus_p_base_fragment.xml | 4 +++- .../iv_roma_taxi_passenger_press_bg.png | Bin 0 -> 14463 bytes .../res/drawable/roma_taxi_p_bg_selector.xml | 8 ++++++++ .../main/res/layout/taxi_p_base_fragment.xml | 4 +++- .../hmi/ui/widget/RomaPassengerView.kt | 14 ++++++++++++++ .../src/main/res/values/attr.xml | 4 ++++ .../identify/TrackerSourceFilterHelper.kt | 4 ++-- .../business/identify/WarningHelper.kt | 2 +- .../main/java/com/mogo/map/AMapWrapper.java | 17 ++++++++++++----- 11 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable/iv_roma_bus_passenger_press_bg.png create mode 100644 OCH/mogo-och-bus-passenger/src/main/res/drawable/roma_bus_p_bg_selector.xml create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_roma_taxi_passenger_press_bg.png create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable/roma_taxi_p_bg_selector.xml 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 0000000000000000000000000000000000000000..a0b2ab93d9989f050b6912379a532db9bf24338a GIT binary patch literal 21461 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 + + + + + + + \ 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 0000000000000000000000000000000000000000..59c45b7c18eb9d24b521dc0a00fea52b57f6ba34 GIT binary patch literal 14463 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 RA7%gm002ovPDHLkV1hrzw~zn; literal 0 HcmV?d00001 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