From 0979e5fd79d721fdccae39c689593bc28ac76fa6 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 14 Feb 2023 18:08:35 +0800
Subject: [PATCH] =?UTF-8?q?[M2]=20M2=20=E7=8A=B6=E6=80=81=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/M2StatusViewManager.java         |  33 +++++++
 .../passenger/ui/widget/M2BlueToothView.kt    |  34 +++++++
 .../passenger/ui/widget/M2StatusBarView.kt    |  86 ++++++++++++++++++
 .../drawable-nodpi/m2_blue_tooth_close.png    | Bin 0 -> 900 bytes
 .../res/drawable-nodpi/m2_blue_tooth_open.png | Bin 0 -> 838 bytes
 .../res/drawable-nodpi/m2_status_bar_logo.png | Bin 0 -> 3771 bytes
 .../res/drawable/m2_power_seekbar_style.xml   |  26 ++++++
 .../res/layout/p_m2_driving_info_fragment.xml |   2 +-
 .../m2/res/layout/p_m2_view_blue_tooth.xml    |  15 +++
 .../m2/res/layout/p_m2_view_status_bar.xml    |  72 +++++++++++++++
 .../src/m2/res/values/colors.xml              |   1 +
 11 files changed, 268 insertions(+), 1 deletion(-)
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml
 create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_status_bar.xml

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java
new file mode 100644
index 0000000000..8966090d91
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/provider/M2StatusViewManager.java
@@ -0,0 +1,33 @@
+package com.mogo.och.bus.passenger.provider;
+
+import android.content.Context;
+import android.view.View;
+
+import com.mogo.och.bus.passenger.ui.widget.M2StatusBarView;
+import androidx.annotation.NonNull;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout;
+
+/**
+ * @author congtaowang
+ * @since 2020-01-06
+ * <p>
+ * 根据优先级控制显示 window view.
+ */
+@Route( path = MogoServicePaths.PATH_STATUS_VIEW_MANAGER )
+public class M2StatusViewManager implements IStatusViewLayout {
+
+
+    @NonNull
+    @Override
+    public View getStatusView(Context context) {
+        return new M2StatusBarView(context);
+    }
+
+    @Override
+    public void init(Context context) {
+
+    }
+}
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt
new file mode 100644
index 0000000000..2916611b3e
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2BlueToothView.kt
@@ -0,0 +1,34 @@
+package com.mogo.och.bus.passenger.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
+import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView
+import com.mogo.och.bus.passenger.R
+import kotlinx.android.synthetic.m2.p_m2_view_blue_tooth.view.*
+
+/**
+ * 魔戒蓝牙控件
+ * 放置于StatusBar右侧位置
+ * todo arrow
+ */
+class M2BlueToothView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener {
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.p_m2_view_blue_tooth, this, true)
+    }
+
+    override fun mofangStatus(status: Boolean) {
+        if (status) {
+            blueView.setImageResource(R.drawable.m2_blue_tooth_close)
+        } else {
+            blueView.setImageResource(R.drawable.m2_blue_tooth_open)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
new file mode 100644
index 0000000000..8eb016875b
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2StatusBarView.kt
@@ -0,0 +1,86 @@
+package com.mogo.och.bus.passenger.ui.widget
+
+import android.content.Context
+import android.graphics.Color
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import chassis.ChassisStatesOuterClass
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener
+import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
+import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
+import com.mogo.eagle.core.function.call.autopilot.CallerBatteryManagementSystemListenerManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
+import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
+import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
+import com.mogo.och.bus.passenger.R
+import kotlinx.android.synthetic.m2.p_m2_view_status_bar.view.*
+import me.jessyan.autosize.utils.AutoSizeUtils
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/2/14
+ */
+class M2StatusBarView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : ConstraintLayout(context, attrs), IViewControlListener, IMoGoSkinModeChangeListener,
+    IMoGoBatteryManagementSystemListener {
+
+    companion object {
+        const val TAG = "M2StatusBarView"
+    }
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.p_m2_view_status_bar, this, true)
+        setBackgroundColor(Color.WHITE)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        post {
+            val params: ViewGroup.LayoutParams = getLayoutParams()
+            params.height = AutoSizeUtils.dp2px(context,47f)
+            layoutParams = params
+        }
+        //添加view控制
+        CallerHmiViewControlListenerManager.addListener(TAG,this)
+        // 添加换肤监听
+        CallerSkinModeListenerManager.addListener(TAG, this)
+        //电量
+        CallerBatteryManagementSystemListenerManager.addListener(TAG,this)
+
+        progress.progress = 50
+        tv_power_cos.text = "50%"
+    }
+
+    override fun onSkinModeChange(skinMode: Int) {
+        when (skinMode) {
+            0 -> setStatusBarDarkOrLight(false)
+            1 -> setStatusBarDarkOrLight(true)
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerHmiViewControlListenerManager.removeListener(TAG)
+        CallerSkinModeListenerManager.removeListener(TAG)
+        CallerDevaToolsManager.hideStatusBar()
+    }
+
+    override fun onBatteryManagementSystemStates(states: ChassisStatesOuterClass.BMSSystemStates) {
+        val bmsSoc = states.bmsSoc
+        if(bmsSoc >1){
+            progress.progress = bmsSoc.toInt()
+            tv_power_cos.text = "${bmsSoc.toInt()}%"
+        }else{
+            val currenPower = (bmsSoc * 100).toInt()
+            progress.progress = currenPower
+            tv_power_cos.text = "$currenPower%"
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c292d2cf325ad03f050017fb62bb4dd871cc394
GIT binary patch
literal 900
zcmV-~1AF|5P)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR915TFA91ONa40RR91761SM0J{~0QUCw~?ny*JR5%fZR9jCIK@>hSyWL)(
z2(_t1E9uQvQ*6A%#0MX$L`0yd5B?v2hrhybYXULyV1h9rprJ~&Ed{j7rKPrjZFhH$
zGYeZ<K|BvTXTI~D(=%tjDS<Q08ySibqW3z`KA%pHS5KqT(?AoGfVq(o-##>+c%zS8
zCf>T9S)fTo<{%9+=I<Z7(8P`$qd+|VLJr2BdHxQz?vXG>Q)?rEXriwbmwfTKtym}w
zYnpcRyeCpD?|l7b61v?%KLWT2z!m_pb6nCH3v~5{DwXYQN$_Z+>J(jA0g$S?{;)4R
z5)gq_lMwS(8;%1ddx8flKDc~sq+f7oVPWE+#|D!GXhj4WXaj+(!{OEf!q0x3*^&sn
zF>%zjyS^JwyLoqq7L7jdtmxGQGUgNrwMcJ?ruXUyAsO*Kl`ID;YWEO9CImF5OEcdy
z$#2a9A}JCXbMBLR0vL80MS#>8pbZG@144(1DIGMKSxjz=y(B)S6^rSHr#rl+QS@_6
z;RBS9Vv4cy8Ax{fWNvBF7@)w~3J9Q7%GBMyTkE>2@?oMyV8SRN<sK_eq(4lxDbmov
zA?5#HT|d`$WRY>AgHY&kS6%y^07T==W?6n5TOAsHm-qTc`R7W_#M=spA^w&$o(#<)
z8gmds<TK&80;(2tUkd)%-OLK?xC3#Gd&qy8;qf){JLLsj79fi<l`{;Om+uv(L&(_^
z-maE16=Mdm*kDIRt&SdQfS^L<x%E`?li8+Nb1TzdC?!eZ8(N@jNC=5uyq$3D)?gHY
zb#c8j3i4|~7Q|Ky#s)oHRQFAcNb<Y<(yOwpIIB#rDs_=;k)+wx&r@qA$y_x+Ki0?{
z;~j7wSYU1=HI)%@shrPiS9}9mjjHRp)I`Bd607+dxhrmj2nj0|>+D);dR4@Q8A@AN
zc&T!qKiPj9LE4ZNC7D|u-)v=>Qf<Xf`h*^!1*cb+$D0y1NoN+&f$k8h%MMiL)2Y+{
aRQ~{&JTca38UaiI0000<MNUMnLSTaW9&`l&

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_blue_tooth_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..cccf9e10fa63a9e77bbff4468729ed74e3320db9
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq000mG000&U1^@s6$*LTD00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR915TFA91ONa40RR91761SM0J{~0QUCw~ut`KgR5%fpRNYHdQ4pUw*VU3<
zlt^mtu5IP6rbHkieLxVgADTu+4~A5)_0U5R{Sm#@Lp@j2LlhKdyJCuEgw#Vwn!5$&
z?iv}95Ph&8_f9i6&w6zisextY{C+cYX6DRYgf+w$j9esueICQOF#B$Bu9B;&1Zs?c
zb`w!=!79G+?~Jr++^yG4pdE?8YZu{pV{>$`#<X@4w6}NHnoXS@8my$blDeWr!)7oR
zbMwk<jnprE&pidO#{A8(Za1lIM3_LtJOI_Q-$S!Ga#C~3gEbyPtmA%bY}>l;4Mk6A
zvZN6oAm9N&{K)Ni$fDb3Q}n#>YWD4;1%)+-*x`eaVAEZ1FmkFCykulj@mJh0<7hL)
z?sO#(iiS`-Zf^_wa(NizBmu@qDLlu0@8@$rD!k14GZ0*N+CcbW03J)H62qkgk|@y9
z*_baDpRwteGs_qLZQ=_v9O!cp#IFjCSSC66TFxsH2;dKPZL_I3#xpVHyh_s5N`+^W
z@ubGf5(r_o9BBfp!0piHWk;L_^n|mifq9LI{-;IK0kqC4yRZ!S-xgL>AVajMFzV`G
zhR7mAbi|)08utaGdzQ}2EqHguO#Wy_nUEKdXFSUrI3$kz=+}6OPP6q3h&I|_kNAU;
z!@@Zg_(DBf@V7nscL&g7=QEjP;)XbAnNKBdDugH}v3Vah@HRb`MN)ybo(7w8BV6_l
zzOeub`@~rXYAt1R5aT45vO8Xq=TrsC6_99=%giYSz4OWVJsniiXdmZ@aV~$WT!IGn
zXWz%K3a_$LiEs7m8@M0iV0va~pcLdXxU~-6iE3vCU>wcPB<^UsN{q?LTR&M%Xt0vz
z&w0^M*flrv<fWT;61ag%HkbWLRY7=eIzF|UUo!#E<qf}Kt@EckUHMP-4_28AYw&aa
Qr~m)}07*qoM6N<$g7NceuK)l5

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad3bd7fda7f90a0a1f7b5f6b05bed973d64b71af
GIT binary patch
literal 3771
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

literal 0
HcmV?d00001

diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml
new file mode 100644
index 0000000000..3ac0c761ba
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/m2_power_seekbar_style.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="5dp"/>
+                <solid android:color="#A3BDF2" />
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <corners android:radius="5dp"/>
+                <solid android:color="#66FFFFFF" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <shape android:shape="rectangle">
+                <corners android:radius="5dp"/>
+                <gradient android:startColor="#56C59C" android:endColor="#56EFA0"/>
+            </shape>
+        </scale>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
index 8440be86dd..d158f9b8b0 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -17,7 +17,7 @@
             android:id="@+id/img_drive_bg"
             android:layout_width="@dimen/dp_290"
             android:layout_height="@dimen/dp_140"
-            android:layout_marginTop="@dimen/dp_24"
+            android:layout_marginTop="@dimen/dp_66"
             android:layout_marginLeft="@dimen/dp_24"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml
new file mode 100644
index 0000000000..69ae14c394
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_blue_tooth.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/dp_18"
+    android:layout_height="@dimen/dp_26">
+
+    <ImageView
+        android:id="@+id/blueView"
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="@dimen/dp_26"
+        android:scaleType="fitXY"
+        android:src="@drawable/m2_blue_tooth_open"
+        tools:ignore="ContentDescription" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_status_bar.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
new file mode 100644
index 0000000000..15a1c12b4f
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_40"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    tools:ignore="MissingDefaultResource">
+
+    <!--Wifi状态-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.WifiStateView
+        android:id="@+id/wifiStateView"
+        android:layout_width="@dimen/dp_28"
+        android:layout_height="@dimen/dp_28"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/dp_50" />
+
+    <!--魔方连接状态 蓝牙-->
+    <com.mogo.och.bus.passenger.ui.widget.M2BlueToothView
+        android:id="@+id/blueToothView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/wifiStateView"
+        android:layout_width="@dimen/dp_15"
+        android:layout_height="@dimen/dp_22"
+        android:src="@drawable/m2_blue_tooth_open"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/dp_32" />
+
+    <SeekBar
+        android:id="@+id/progress"
+        android:layout_width="@dimen/dp_115"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_40"
+        android:layout_marginEnd="@dimen/dp_7"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/tv_power_cos"
+        android:maxHeight="@dimen/dp_8"
+        android:minHeight="@dimen/dp_8"
+        android:layout_marginRight="4dp"
+        android:splitTrack="false"
+        android:progressDrawable="@drawable/m2_power_seekbar_style"
+        android:thumb="@null" />
+
+    <TextView
+        android:id="@+id/tv_power_cos"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:textSize="@dimen/dp_18"
+        android:textColor="@color/m2_power_tv_color"
+        android:layout_marginRight="@dimen/dp_50"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/m2_status_bar_logo"
+        android:scaleType="fitXY"
+        android:layout_width="@dimen/dp_96"
+        android:layout_height="@dimen/dp_28"/>
+
+
+
+</merge>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
index da9dd9c7d0..13bd4aff12 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
@@ -10,6 +10,7 @@
  <color name="m2_no_line_tv_color">#6B7EA6</color>
  <color name="m2_light_tv_color">#2D3E5F</color>
  <color name="m2_pnc_bg_color">#A5D8FF</color>
+ <color name="m2_power_tv_color">#1B2546</color>
 
  <color name="bus_traffic_light_red_color_up">#FFFFA28B</color>
  <color name="bus_traffic_light_red_color_down">#FFDA1100</color>