From 6116c12266d8ce95a2ab6aa9a3110b88f34df64d Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 20 Jul 2023 17:23:02 +0800
Subject: [PATCH 1/2] [3.4.0] code style

---
 .../main/java/com/mogo/eagle/core/function/main/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
index b55ed3929f..29cb52dc91 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
@@ -105,7 +105,7 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
         if (statusBarView == null) {
             val statusBar = CallerHmiFloatViewManager.getView(this)
             statusBarView = statusBar ?: StatusBarView(this)
-            statusBarView.setTag("status_bar")
+            statusBarView.tag = "status_bar"
         }
         val statusBarLP = FrameLayout.LayoutParams(
             ViewGroup.LayoutParams.MATCH_PARENT,

From 12f4e548352bc06ca5d372e9cb5dd6fcfb6925c8 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 20 Jul 2023 18:03:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[3.4.0]=E8=B0=83=E6=95=B4Taxi=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E7=BA=A2=E7=BB=BF=E7=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/taxi_p_base_fragment.xml   |  6 ++++--
 .../hmi/ui/widget/SingleTrafficLightView.kt    | 18 +++++++++++++++++-
 .../res/drawable/traffic_light_bg_taxi_p.xml   |  7 +++++++
 .../src/main/res/values/attr.xml               |  6 ++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml

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 d1e357c336..f635f9274c 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
@@ -85,11 +85,13 @@
         android:id="@+id/traffic_light_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_100"
+        android:layout_marginTop="@dimen/dp_83"
         android:layout_marginRight="@dimen/taxi_p_traffic_light_layout_margin_right"
         android:visibility="gone"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:traffic_light_user="taxi_p"
+        />
 
     <!--转向灯-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt
index 4cad9b61a0..78f0983f27 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt
@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.ImageView
@@ -46,6 +45,17 @@ class SingleTrafficLightView @JvmOverloads constructor(
     private var mLightSourceDivider: View? = null
     private var mCurrentLightId = TrafficLightEnum.BLACK
 
+    private var trafficLightUser = 0 //0:默认；1：Taxi乘客屏肤色
+
+    init{
+        context?.let {
+            val typedArray = it.obtainStyledAttributes(attrs, R.styleable.TrafficLightView)
+            trafficLightUser = typedArray.getInt(R.styleable.TrafficLightView_traffic_light_user,0)
+            typedArray.recycle()
+        }
+
+    }
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         LayoutInflater.from(context).inflate(R.layout.hmi_view_traffic_light, this, true)
@@ -55,6 +65,12 @@ class SingleTrafficLightView @JvmOverloads constructor(
         mLightSourceTV = findViewById(R.id.hmi_traffic_light_source)
         mLightSourceDivider = findViewById(R.id.hmi_traffic_light_divider)
 
+        if(trafficLightUser==1){
+            hmi_traffic_light_bg.setBackgroundResource(R.drawable.traffic_light_bg_taxi_p)
+            hmi_traffic_light_source.setTextColor(resources.getColor(R.color.color_2D3E5F))
+            hmi_traffic_light_divider.setBackgroundColor(resources.getColor(R.color.color_2D3E5F))
+        }
+
         CallerSkinModeListenerManager.addListener(TAG, this)
         CallerTrafficLightListenerManager.addListener(TAG, this)
         CallerHmiViewControlListenerManager.addListener(TrafficLightView_TAG, this)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml
new file mode 100644
index 0000000000..52301a645b
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FFCEDCF7"/>
+    <corners android:radius="@dimen/hmi_traffic_light_layout_corner"/>
+</shape>
\ No newline at end of file
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 edfb6e9642..a8bee1d4d4 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
@@ -77,6 +77,12 @@
         </attr>
     </declare-styleable>
 
+    <declare-styleable name="TrafficLightView">
+        <attr name="traffic_light_user">
+            <enum name="taxi_p" value="1" />
+        </attr>
+    </declare-styleable>
+
     <declare-styleable name="PncActionsView">
         <attr name="background_resource" format="reference"/>
         <attr name="pnc_top_margin" format="dimension"/>