From 2841ab8f4252e6e4b7ba5612800f62e760acd806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 13 Sep 2021 11:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=EF=BC=8C=E5=85=88=E6=B3=A8=E9=87=8A=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=80=E5=90=8E=E7=A1=AC=E4=BB=B6=E5=AE=9E=E5=9C=A8?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E4=BA=86=E5=86=8D=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
---
 .../mogo/module/hmi/ui/MoGoWarningFragment.kt    |  3 ++-
 .../res/layout/module_main_activity_main.xml     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
index 7e33c7ef62..7619791045 100644
--- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
+++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
@@ -9,12 +9,12 @@ import android.view.animation.OvershootInterpolator
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.voice.AIAssist
 import com.mogo.module.common.enums.EventTypeEnum
+import com.mogo.module.data.enums.WarningDirectionEnum
 import com.mogo.module.hmi.R
 import com.mogo.module.hmi.notification.WarningFloat
 import com.mogo.module.hmi.notification.anim.DefaultAnimator
 import com.mogo.module.hmi.notification.enums.SidePattern
 import com.mogo.module.hmi.ui.widget.V2XNotificationView
-import com.mogo.module.data.enums.WarningDirectionEnum
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.fragment_warning.*
 
@@ -72,6 +72,7 @@ class MoGoWarningFragment : MvpFragment<MoGoWarningContract.View?, WaringPresent
                 .setTag(tag)
                 .setLayout(notificationView)
                 .setSidePattern(SidePattern.TOP)
+                //.setCountDownTime(10000)
                 .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
                 .setImmersionStatusBar(true)
                 .setAnimator(object : DefaultAnimator() {
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index f545a6accd..191e010b0a 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -13,11 +13,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <!--小地图视图-->
-    <FrameLayout
-        android:id="@+id/module_main_id_smp_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 
     <!--四个方向，碰撞预警-->
     <FrameLayout
@@ -79,6 +74,11 @@
             app:layout_constraintEnd_toEndOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <!--预警视图 OBU、云端下发、自车感知、自车策略-->
+    <FrameLayout
+        android:id="@+id/module_main_id_waring_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
     <!-- 左侧阴影背景 -->
     <FrameLayout
@@ -146,16 +146,16 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+
     <!--网约车视图-->
     <FrameLayout
         android:id="@+id/module_main_id_och_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-
-    <!--预警视图 OBU、云端下发、自车感知、自车策略-->
+    <!--小地图视图-->
     <FrameLayout
-        android:id="@+id/module_main_id_waring_fragment"
+        android:id="@+id/module_main_id_smp_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />