diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
index 3de8df06cd..332449fdbb 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
@@ -57,12 +57,18 @@ public class MoGoHandAdasMsgManager implements
                 //turnLightOften 是sdk适配的字段，后期建议CarStateInfo和AutopilotCarStateInfo统一成一个
                 int turnLight = bean.getTurnLightOften();
                 AmiClientManager.getInstance().setTurnLightState(turnLight);
-                int brakeLight = bean.getBrake_light();
+                int brakeLight = bean.getBrake_light(); //1刹车灯亮 其他为松开
 //            Logger.d(TAG, "onCarStateData ---- turnLight = " + turnLight + "---brakeLight = " + brakeLight);
                 //设置转向灯
-                CallerHmiManager.INSTANCE.showTurnLight(turnLight);
+                if (turnLight == 1 || turnLight == 2) {
+                    CallerHmiManager.INSTANCE.showBrakeLight(0);
+                    CallerHmiManager.INSTANCE.showTurnLight(turnLight);
+                }
+
                 //设置刹车信息
-                CallerHmiManager.INSTANCE.showBrakeLight(brakeLight);
+                if (turnLight == 0){
+                    CallerHmiManager.INSTANCE.showBrakeLight(brakeLight);
+                }
             } else {
                 Logger.e(TAG, "bean == null ");
             }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_nor.png
index 335476d4c3..5f8c2eecb7 100644
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_nor.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_nor.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor.png
index 7d22f5a4c0..10923238dc 100644
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_nor.png
index 4f62802781..bb060b8681 100644
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_nor.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_nor.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_select_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_select_nor.png
index 7ec2819571..6372f3dd3c 100644
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_select_nor.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_right_select_nor.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_light_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_light_nor.png
index 3822f780ed..cda6807b2a 100644
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_light_nor.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_light_nor.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turnlight_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turnlight_background.xml
new file mode 100644
index 0000000000..63bf5dd935
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turnlight_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/turnlight_bg_color" />
+    <corners android:radius="@dimen/turnlight_bg_corner" />
+</shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
index e88f74560e..25cd258be8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -169,10 +169,13 @@
         android:id="@+id/brakeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginBottom="80px" />
+        android:layout_marginTop="42px" />
 
+<!--    app:layout_constraintBottom_toBottomOf="parent"-->
+<!--    app:layout_constraintEnd_toEndOf="parent"-->
+<!--    app:layout_constraintStart_toStartOf="parent"-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml
index 8aa741682d..983cd44df6 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status.xml
@@ -2,29 +2,34 @@
 <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="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="@dimen/brakelight_width"
+    android:layout_height="@dimen/brakelight_height"
     android:visibility="visible">
 
     <LinearLayout
         android:id="@+id/layout_brake"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:background="@drawable/module_blank_nor"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_gravity="top|center_horizontal"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:gravity="center_horizontal"
         android:visibility="gone">
 
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        android:gravity="center_horizontal"-->
         <ImageView
             android:id="@+id/image_brake"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="110px"
             android:layout_gravity="center_vertical"
             android:src="@drawable/module_light_nor"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
@@ -37,8 +42,7 @@
             android:textColor="#ffffff"
             android:textSize="45px"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/image_brake"
-            app:layout_constraintTop_toTopOf="@+id/image_brake" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/image_brake" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml
index 1ec273511c..d2dd2a6052 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_turn_light_status.xml
@@ -2,17 +2,17 @@
 <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="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="@dimen/turnlight_width"
+    android:layout_height="@dimen/turnlight_height"
     android:visibility="visible">
 
     <FrameLayout
         android:id="@+id/turn_light_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:visibility="gone"
+        android:background="@drawable/turnlight_background"
         android:layout_gravity="top|center_horizontal"
-        android:background="@drawable/module_turn_light_bg"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
index 304e9575c6..317d205176 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -43,4 +43,5 @@
     <color name="version_upgrading_color">#3B4577</color>
     <color name="dialog_bg_color">#3B4577</color>
 
+    <color name="turnlight_bg_color">#000000</color>
 </resources>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
index 0f799ac211..4d983f8617 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
@@ -35,5 +35,11 @@
     <dimen name="dp_580">580px</dimen>
     <dimen name="dp_588">588px</dimen>
     <dimen name="dp_1066">1066px</dimen>
-    
+
+    <dimen name="turnlight_bg_corner">60px</dimen>
+    <dimen name="turnlight_width">270px</dimen>
+    <dimen name="turnlight_height">120px</dimen>
+    <dimen name="brakelight_width">460px</dimen>
+    <dimen name="brakelight_height">120px</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle
deleted file mode 100644
index e69de29bb2..0000000000