[6.2.6]change the mogo p

2023-12-18 17:34:47 +08:00
parent 4c5b88aecf
commit fdb4133160
11 changed files with 75 additions and 46 deletions
--- a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_pnc_bg.png
+++ b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_pnc_bg.png
--- a/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png
+++ b/OCH/taxi/passenger/src/main/res/drawable-xhdpi/taxi_p_pnc_bg.png
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

@@ -9,20 +8,19 @@
        android:id="@+id/overMapView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        app:resetDrawable="@null"
-        app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
-        app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
+        app:arrivedDrawable="@drawable/taxi_overmap_arrived"
+        app:bottomPadding="160"
        app:carDrawable="@drawable/taxi_p_map_car"
        app:compassDrawable="@drawable/taxi_p_map_car_light"
-        app:arrivedDrawable="@drawable/taxi_overmap_arrived"
-        app:unArrivedDrawable="@drawable/taxi_overmap_arriving"
+        app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
+        app:leftPadding="850"
        app:mapStyleExtraPath="style_extra.data"
        app:mapStylePath="style.data"
-        app:leftPadding="850"
+        app:resetDrawable="@null"
        app:rightPadding="160"
+        app:startPointDrawable="@drawable/taxi_p_map_view_dir_start"
        app:topPadding="160"
-        app:bottomPadding="160"
-        />
+        app:unArrivedDrawable="@drawable/taxi_overmap_arriving" />

    <!-- 视频播放View -->
    <com.mogo.och.taxi.passenger.ui.video.InfoVideoView
@@ -33,22 +31,23 @@
    <!--  高精地图  -->
    <com.mogo.eagle.core.function.view.MapBizView
        android:id="@+id/mapBizView"
-        app:styleMode="MAP_STYLE_DAY_VR"
-        app:isWeatherEnable="false"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        app:isWeatherEnable="false"
+        app:styleMode="MAP_STYLE_DAY_VR" />

    <!--pnc行为决策-->
    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
        android:id="@+id/pcnActionView"
        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_90"
+        android:layout_height="@dimen/dp_81"
        android:layout_marginBottom="@dimen/dp_255"
-        app:pnc_size="@dimen/dp_44"
        app:background_resource="@drawable/taxi_p_pnc_bg"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:pnc_size="@dimen/dp_40"
+        app:pnc_txt_style="@style/AudioFileInfoOverlayText" />

    <CheckBox
        android:id="@+id/ck_setting"
@@ -89,10 +88,10 @@
        android:layout_height="@dimen/dp_120"
        android:layout_marginStart="@dimen/dp_50"
        android:layout_marginTop="100dp"
-        app:roma_distance_bg="@drawable/roma_distance_bg"
        app:layout_constraintLeft_toRightOf="@+id/romaPView"
        app:layout_constraintTop_toTopOf="parent"
-        app:roma_change_dis_color="true" />
+        app:roma_change_dis_color="true"
+        app:roma_distance_bg="@drawable/roma_distance_bg" />

    <TextView
        android:id="@+id/rv_location_center"
@@ -114,19 +113,17 @@
        android:visibility="gone"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        app:traffic_light_user="traffic_light_taxi_p"
-        />
+        app:traffic_light_user="traffic_light_taxi_p" />

    <!--转向灯-->
    <com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
        android:layout_marginTop="@dimen/dp_100"
        android:layout_marginEnd="@dimen/dp_40"
-        app:user="taxi_p"
-        />
+        app:layout_constraintRight_toLeftOf="@id/traffic_light_view"
+        app:layout_constraintTop_toTopOf="parent"
+        app:user="taxi_p" />

    <!--  路程信息  -->
    <com.mogo.och.taxi.passenger.ui.orderinfo.ItineraryView
@@ -158,15 +155,15 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginEnd="@dimen/dp_50"
-        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
        android:layout_marginBottom="-80dp"
+        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
        app:layout_constraintEnd_toEndOf="parent" />

    <com.mogo.och.taxi.passenger.ui.debug.DebugView
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="@dimen/dp_120"
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_120"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/OCH/taxi/passenger/src/main/res/values/styles.xml
+++ b/OCH/taxi/passenger/src/main/res/values/styles.xml
@@ -61,4 +61,8 @@
        <item name="android:windowFullscreen">false</item>
    </style>

+    <style name="AudioFileInfoOverlayText">
+        <item name="android:shadowColor">#80000000</item>
+        <item name="android:shadowRadius">11</item>
+    </style>
 </resources>
--- a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_pnc_bg.png
+++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_pnc_bg.png
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -40,13 +40,14 @@
    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
        android:id="@+id/pcnActionView"
        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_90"
+        android:layout_height="@dimen/dp_81"
        android:layout_marginBottom="@dimen/dp_255"
        app:background_resource="@drawable/taxt_u_p_pnc_bg"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:pnc_size="@dimen/dp_44" />
+        app:pnc_size="@dimen/dp_40"
+        app:pnc_txt_style="@style/AudioFileInfoOverlayText" />

    <com.mogo.och.taxi.passenger.ui.speed.SpeedView
        android:id="@+id/speedView"
--- a/OCH/taxi/unmanned-passenger/src/main/res/values/styles.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/values/styles.xml
@@ -54,4 +54,8 @@
        <item name="android:windowFullscreen">false</item>
    </style>

+    <style name="AudioFileInfoOverlayText">
+        <item name="android:shadowColor">#80000000</item>
+        <item name="android:shadowRadius">11</item>
+    </style>
 </resources>
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt
@@ -42,6 +42,7 @@ class PncActionsView @JvmOverloads constructor(

    private val bgResources: Int
    private val txtSize: Float
+    private val txtStyle: Int

    init {
        LayoutInflater.from(context).inflate(R.layout.view_pnc_actions, this, true)
@@ -54,13 +55,17 @@ class PncActionsView @JvmOverloads constructor(
            R.styleable.PncActionsView_pnc_size,
            resources.getDimension(R.dimen.dp_34)
        )
+        txtStyle = a.getResourceId(R.styleable.PncActionsView_pnc_txt_style,0)
+        tvHmiPncActions.setTextAppearance(txtStyle)
        a.recycle()
    }

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
        tvHmiPncActions.setTextSize(COMPLEX_UNIT_PX, txtSize)
-
+        tvHmiPncActions.background =
+            AppCompatResources.getDrawable(context, bgResources)
+        tvHmiPncActions.text = "前方右转"
        CallerAutoPilotStatusListenerManager.addListener(TAG, this)
        CallerPlanningActionsListenerManager.addListener(TAG, this)
        CallerTrafficLightListenerManager.addListener(TAG, this)
@@ -74,12 +79,12 @@ class PncActionsView @JvmOverloads constructor(
    }

    override fun onAutopilotStatusResponse(state: Int) {
-        if (state != STATUS_AUTOPILOT_RUNNING) {
-            UiThreadHandler.post {
-                tvHmiPncActions.background = null
-                tvHmiPncActions.text = ""
-            }
-        }
+//        if (state != STATUS_AUTOPILOT_RUNNING) {
+//            UiThreadHandler.post {
+//                tvHmiPncActions.background = null
+//                tvHmiPncActions.text = ""
+//            }
+//        }
    }

    @BizConfig(FOUNDATION, "", BIZ_PNC_ACTIONS)
--- 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
@@ -86,8 +86,14 @@
    <declare-styleable name="PncActionsView">
        <attr name="background_resource" format="reference"/>
        <attr name="pnc_size" format="dimension"/>
+        <attr name="pnc_txt_style" format="reference"/>
    </declare-styleable>

+    <style name="AudioFileInfoOverlayText">
+        <item name="android:shadowColor">#80000000</item>
+        <item name="android:shadowRadius">11</item>
+    </style>
+
    <declare-styleable name="DriverMsgBoxButtonView">
        <attr name="bgDrawable" format="reference"/>
    </declare-styleable>
--- 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
@@ -72,6 +72,13 @@ object TrackerSourceFilterHelper {
            }
        }

+        // pnc预警
+        WarningHelper.getPncColor(data.uuid.toString()) {
+            if (it.isNotBlank()) {
+                color = it
+            }
+        }
+
        //僵尸车
        if (data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE) {
            color = "#7A8499FF"
@@ -82,12 +89,6 @@ object TrackerSourceFilterHelper {
            CallerFuncBizListenerManager.invokeAttrZombieAnalyticsEvent()
        }

-        // pnc预警
-        WarningHelper.getPncColor(data.uuid.toString()) {
-            if (it.isNotBlank()) {
-                color = it
-            }
-        }
        return color
    }

--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java
@@ -312,12 +312,12 @@ public final class DeviceUtils {
        return Build.MANUFACTURER;
    }

-    public static Boolean isLenovoModel(){
+    public static Boolean isLenovoModel() {
        return getModel().contains("Lenovo") || getBrand().contains("Lenovo");
    }

-    public static Boolean isEB5Model(){
-        return getModel().contains("R.5.LA");
+    public static Boolean isEB5Model() {
+        return getModel().contains("R.5.LA") || getProductBoard().contains("kona") || getProductBoard().contains("kalama");
    }

    /**
@@ -625,6 +625,17 @@ public final class DeviceUtils {
        return serial;
    }

+    public static String getProductBoard() {
+        String productBoard = "null";
+        try {
+            Class<?> c = Class.forName("android.os.SystemProperties");
+            Method get = c.getMethod("get", String.class);
+            productBoard = (String) get.invoke(c, "ro.product.board");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return productBoard;
+    }

    /**
     * 获取 	机器型号