From 47eae5bf0b2a17a41848db3a0eaede66be032589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 20 Aug 2021 12:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF=E7=81=AF?=
 =?UTF-8?q?=E3=80=81=E5=BC=B9=E7=AA=97=E8=83=8C=E6=99=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                             | 2 +-
 .../src/main/res-warning/drawable/bg_warning_bg.xml        | 2 +-
 .../src/main/res/layout/view_traffic_light_vr.xml          | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 010a13f489..a947751e37 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,7 @@
         <entry key="../../../../../layout/custom_preview.xml" value="0.19947916666666668" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="0.34427083333333336" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/notification_v2x_msg_vr.xml" value="0.3453125" />
-        <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="0.25" />
+        <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="1.25" />
         <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" />
diff --git a/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml b/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml
index a828c9070f..d247f7d96a 100644
--- a/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.xml
+++ b/modules/mogo-module-common/src/main/res-warning/drawable/bg_warning_bg.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="#E6000000" />
+    <solid android:color="#000000" />
     <corners android:radius="30px" />
 </shape>
\ No newline at end of file
diff --git a/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml b/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml
index e0383fa74f..9de5cc63ba 100644
--- a/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml
+++ b/modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml
@@ -33,14 +33,15 @@
         android:id="@+id/ctvYellowTrafficLight"
         android:layout_width="110px"
         android:layout_height="110px"
+        android:layout_marginStart="90px"
         android:background="@drawable/icon_waring_traffic_light_yellow_vr"
         android:gravity="center"
+        android:singleLine="true"
         android:textAlignment="center"
         android:textColor="#FFFFFF"
         android:textSize="38px"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/ctvGreenTrafficLight"
-        app:layout_constraintStart_toEndOf="@+id/ctvRedTrafficLight"
+        app:layout_constraintStart_toStartOf="@+id/ctvRedTrafficLight"
         app:layout_constraintTop_toTopOf="parent"
         tools:checked="true"
         tools:text="99" />
@@ -49,6 +50,7 @@
         android:id="@+id/ctvGreenTrafficLight"
         android:layout_width="110px"
         android:layout_height="110px"
+        android:layout_marginStart="90px"
         android:background="@drawable/icon_waring_traffic_light_green_vr"
         android:gravity="center"
         android:textAlignment="center"
@@ -56,6 +58,7 @@
         android:textSize="38px"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/ctvYellowTrafficLight"
         app:layout_constraintTop_toTopOf="parent"
         tools:checked="true"
         tools:text="99" />