From 3ddb84933a3386cd7a84f118f0cc9bef55ba5260 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 15 Nov 2021 21:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E8=AD=A6=E7=B1=BB=E5=9E=8B=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=BC=B9=E7=AA=97tag=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                               | 3 ++-
 .../java/com/mogo/eagle/core/function/hmi/WaringConst.java     | 2 ++
 .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt     | 3 ++-
 .../eagle/core/function/hmi/ui/notice/NoticeBannerView.java    | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3dda1fe044..cf5757e710 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -82,6 +82,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java
index da920a1bc9..4fe7e00fa1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java
@@ -30,5 +30,7 @@ public class WaringConst {
     public static String BROADCAST_V2X_LIMITING_VELOCITY_IS_SHOW__EXTRA_KEY = "limitingVelocityIsShow";
     // 限速的速度
     public static String BROADCAST_V2X_LIMITING_VELOCITY_SPEED__EXTRA_KEY = "limitingVelocitySpeed";
+    // 交警任务
+    public static String NOTICE_FOR_TRAFFIC_KEY = "noticeForTraffic";
 
 }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index f2444ddf4d..ca4990c81a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -20,6 +20,7 @@ import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat
 import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
 import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
@@ -367,7 +368,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                 mNoticeFloat = it?.let { it1 ->
                     noticeBannerView?.let { it2 ->
                         WarningFloat.with(it1)
-                            .setTag(tag)
+                            .setTag(WaringConst.NOTICE_FOR_TRAFFIC_KEY)
                             .setLayout(it2)
                             .setSidePattern(SidePattern.TOP)
                             .setCountDownTime(60 * 1000 * 3)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java
index 81cf94a343..d311dfe146 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java
@@ -89,7 +89,7 @@ public class NoticeBannerView extends ConstraintLayout {
         noticeBannerCheck.setOnClickListener(v -> {
             mNoticeTrafficDialog = new NoticeTrafficDialog(mContext, mPushData);
             mNoticeTrafficDialog.show();
-            WarningFloat.dismiss(WaringConst.MODULE_NAME);
+            WarningFloat.dismiss(WaringConst.NOTICE_FOR_TRAFFIC_KEY);
         });
     }