From 9fe24a942b5f960e9453ed2d67bfe0c9fe45aa2c Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Wed, 18 Sep 2024 11:25:25 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0][FSM]=20feat:=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/bone/status/fsm/FSMStatusDetailView.kt |  11 ++++++-----
 .../icon_fsm_error_green_arrow.png             | Bin 0 -> 277 bytes
 .../icon_fsm_error_red_arrow.png               | Bin 1173 -> 265 bytes
 .../drawable/bg_fsm_status_detail_close.xml    |   2 +-
 .../status_dialog_fsm_status_background.xml    |   8 ++++----
 .../res/layout/view_status_fsm_item_layout.xml |   3 ++-
 6 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_error_green_arrow.png

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/fsm/FSMStatusDetailView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/fsm/FSMStatusDetailView.kt
index 47115ebe99..dcf5bd1f5e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/fsm/FSMStatusDetailView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/fsm/FSMStatusDetailView.kt
@@ -60,7 +60,7 @@ class FSMStatusDetailView @JvmOverloads constructor(
             val c = Color.parseColor("#FF4E41")
             tvTitle?.setTextColor(c)
         }
-        addFsmMsgItemView(msgArray)
+        addFsmMsgItemView(msgArray, true)
 
         //监听最新 FSM 状态
         StatusManager.addListener(TAG, this)
@@ -69,16 +69,16 @@ class FSMStatusDetailView @JvmOverloads constructor(
     private fun setFsmNormalStatus() {
         tvTitle?.text = "FSM正常"
         runCatching {
-            val c = Color.parseColor("#2EACFF")
+            val c = Color.parseColor("#26C14F")
             tvTitle?.setTextColor(c)
         }
-        removeFsmMsgItemView()
+        addFsmMsgItemView(ArrayList<String>().also { it += "FSM异常状态已恢复" }, false)
     }
 
     private fun setFsmUnknownStatus() {
         tvTitle?.text = "FSM状态未知"
         runCatching {
-            val c = Color.parseColor("#FFFFFF")
+            val c = Color.parseColor("#FFCD3D")
             tvTitle?.setTextColor(c)
         }
         removeFsmMsgItemView()
@@ -93,7 +93,7 @@ class FSMStatusDetailView @JvmOverloads constructor(
         removeFsmMsgItemView()
     }
 
-    private fun addFsmMsgItemView(msgArray: ArrayList<String>) {
+    private fun addFsmMsgItemView(msgArray: ArrayList<String>, isError: Boolean) {
         if (llFsmMsgContainerLayout == null) {
             Logger.e(TAG, "addFsmMsmItemView llFsmMsgContainerLayout is null")
             return
@@ -104,6 +104,7 @@ class FSMStatusDetailView @JvmOverloads constructor(
             val itemView: View = LayoutInflater.from(context)
                 .inflate(R.layout.view_status_fsm_item_layout, llFsmMsgContainerLayout, false)
             val leftImageView: ImageView = itemView.findViewById(R.id.leftImageView)
+            leftImageView.setImageResource(if (isError) R.drawable.icon_fsm_error_red_arrow else R.drawable.icon_fsm_error_green_arrow)
             val rightTextView: TextView = itemView.findViewById(R.id.rightTextView)
             rightTextView.text = it
             llFsmMsgContainerLayout?.addView(itemView)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_error_green_arrow.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_error_green_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2247e49b854330ce82d47325b3723f9f5be3d0a7
GIT binary patch
literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~STEL88gA~qMxhWJ#)qA=)hFAzL
zy>ynhL4k)gLE+q@zJ=T?lr1OuG2}cnNwN?T_P8uxmHBB>U1j?$&Ah~K$CIp%_Z9lz
z+@R+Ad)Md4^$QHSS&m0-XxyT}<>@H&s41s|>8JqPs)bS|0$<)aa{u{X)}GU`P^v*G
shlBZs0P6$+aR)`s3l32W9QHCe$Y1x*&;PhCTnywSPgg&ebxsLQ0BR0QC;$Ke

literal 0
HcmV?d00001

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_error_red_arrow.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_error_red_arrow.png
index e30e3b9265a43861a69321715ccb8e4d7ce71452..fba55f99d131b30f06997e61c4e4fc26aa40a1dd 100644
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~STEL88gA~qMxhWJ#6??ikhFAzL
zy>yWCfB^^V1(lKwC5@LRS_Qdpn0!-C%SGVgdhws^^8XVaC#%~%&pG;1{>c81TMmZr
z?-VF*eIm!C%fV!;!Rod^U`At%K%>tFCd~qmRqxg^tf+TZVD*^Dlfoo<f>kMi<HG`x
g1V@1lPO1(I#HU}5U2kOWIu+y$Pgg&ebxsLQ0Nj{GZvX%Q

literal 1173
zcmV;G1Zw+<P)<h;3K|Lk000e1NJLTq000#L000&U1^@s6FN4=O0004BX+uL$Nkc;*
zP;zf(X>4Tx04R}lkUdL6VHk!l(}?VYiUJ1*w+bvwZK$p66C5Oq%I$bMYGC$qJP{2+
zLq8xW8u|gzKX7Sis67Y@9HOzMDRAlI^c=0UqW9(DzPNer_kDPvsa;bl?*TRnmboxH
z8CY3O1zH|yr4uiHf|_1b6NyAzTKLkRr*ezS(VHRXt*3!h`Q&~)W%YF|zZ-7*Z~u?u
zT{DWh=&MvzSEdE7kZ@w#QV#D4_nI=4@R7sW8lO3wuJL)bXK^7Wd@bCi=d?B92jO74
z!Ou4EMt)2GoWYsC-6$+2MSW6!rkEx!H$ajw5k?qej^sa?Xf+dK6U7cD>txAcNqRyY
zMIJ+Vo&q|<1ck$dq@vEQfA6sF<*s1#Qoi!lz04t$D$u=O_xg9CX9g|~lxAw*n{`z@
z#Y`kz<F*nsAKUixGPDfB+nsH{lx+L$6x?OWRz3g^LS#m-xR(b2001~;SV?A0O#mtY
z000O80f%V-1ONa40RR918UO$Q0007@0ssU600031000%B0{{d700031000&M0001N
zb4ug@00ON^L_t(I5v5gIZWBQe?3o>7|L_P1n**Q-At436a!6u0193hA+#~sjk{kuB
zK>V87R8{X7D+<KGtaf*Hr@OYgx~DhnzIxMI2$ok%+=9g>SzC&qh9w*^HP*IfIj_v{
z4%77r>zP>$4g90UO#@n2Bf9!QFF<3Vt_hWn8_s}&fm=jTsH>fq>`6^ddJ>-yBH<mK
zwm7-Uw=pF!4OVgiQ#f-n89lMRenN-^mQ)1aj*SJJrMOMoLY9tzfB?rkMJkYtC-J};
z4lv#y^zF;&sT~d<+S@+Bq%VQtR5BcJlD!kuI&GZ2VSR=5Of-NhIya^R!9NT9vF-J+
z43@vNWvJ1brYC4I2O%CV1J)vB5N4+(LF?EbJh0>8j(vLm$lhVz<v=?6+=)~{D1(d`
z;o7*O-MSN;vK)<e0N#^SdBxHqhM>SbSc60nw4m&is5^+>f_7QHzIY~ZCRFlnXw3MD
zqq=tSw}JKVP;-J$M$mka#8wQEc|xkR+|>2)`F7V@Et4U@#T@BG(ip<Mn%?(`3VsOY
zEJfC8;(lel{qG=x$J<&`0i(eGb)3!?HlF^li`mjq0hKa#LMVR^O0bX9pLTXV*XB_6
z5iwGQ@NrQsY)SQGHn;J&E4y4U+t{96(4HI@A+cy{llT+vDZt(X>|&1M1`F=-u1u8^
zZUi+aCW;-155F5H2ygtIU>P0Dw;=810b*#&h}7lN74yUnbQe>Gc|c}J009~pvsq-d
zH*QmPRtpWP2L|kP1n0pm(JebyGW&o8TrRU58~k3FOlikG-+`}NVWu62N6Ra^0PTV?
zn+MY?JHKA2Imd{wG(0paltV$dY}|OKiXnujYE!}Ra`!b>&|N^E3E)po9b9{v->2px
ns2>|2c+`eXNoYmp`~=4hO43!a9{ezQ00000NkvXXu0mjfbqoR&

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml
index 49c0646059..1d9b7398e3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#000000" />
+    <solid android:color="#B3000000" />
     <corners android:radius="@dimen/dp_30" />
 </shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml
index 7e234745fd..f2042b04ad 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml
@@ -3,18 +3,18 @@
     android:shape="rectangle">
 
     <gradient
-        android:angle="90"
+        android:angle="180"
         android:endColor="#2E323A"
         android:startColor="#3B3D44" />
 
     <stroke
-        android:width="1dp"
+        android:width="2px"
         android:color="#FFFFFF">
         <shape>
             <gradient
                 android:angle="90"
-                android:endColor="#6C6C6C"
-                android:startColor="#FFFFFF" />
+                android:endColor="#996C6C6C"
+                android:startColor="#40FFFFFF" />
         </shape>
     </stroke>
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml
index 995b38abe8..ad87fa36f5 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml
@@ -4,13 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:gravity="top"
     android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/leftImageView"
         android:layout_width="@dimen/dp_18"
         android:layout_height="@dimen/dp_18"
-        android:layout_gravity="top"
+        android:layout_gravity="top|center_horizontal"
         android:layout_marginTop="@dimen/dp_10"
         android:src="@drawable/icon_fsm_error_red_arrow" />