From 45109aabb95decd2a175c73c85cdeea4355d402e Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sat, 30 Oct 2021 19:18:20 +0800
Subject: [PATCH] =?UTF-8?q?[UI]=20=E4=BA=A4=E8=AD=A6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt   | 3 +++
 .../core/function/hmi/ui/notice/NoticeBannerView.java    | 9 +++++++--
 .../src/main/res/layout/notice_push_top_banner.xml       | 7 +++----
 .../src/main/res/values-xhdpi-2560x1440/dimens.xml       | 1 +
 .../src/main/res/values/dimens.xml                       | 1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

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 242e1c9ed4..ca42c8ac2b 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
@@ -217,6 +217,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) {
         activity.let {
             val noticeBannerView = this.getContext()?.let { it1 -> NoticeBannerView(it1) }
+            if (noticeBannerView != null) {
+                noticeBannerView.refreshWithData(trafficStylePushData)
+            }
             mWarningFloat = it?.let { it1 ->
                 noticeBannerView?.let { it2 ->
                     WarningFloat.with(it1)
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 92f4dac050..b6e284d3d5 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
@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo;
+import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData;
 import com.mogo.eagle.core.function.hmi.R;
 
 /**
@@ -47,6 +48,10 @@ public class NoticeBannerView extends ConstraintLayout {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
+    public void refreshWithData(NoticeTrafficStylePushData pushData){
+        noticePushTitle.setText(pushData.getMsg());
+        noticePushContent.setText(pushData.getContent());
+    }
     public void initView() {
         styleImageView = findViewById(R.id.notice_push_style_image);
         iconImageView = findViewById(R.id.notice_push_icon_video);
@@ -55,8 +60,8 @@ public class NoticeBannerView extends ConstraintLayout {
         noticeBannerCheck = findViewById(R.id.notice_push_banner_check);
 
         noticeBannerCheck.setOnClickListener(v -> {
-            mNoticeTrafficDialog = new NoticeTrafficDialog(mContext);
-            mNoticeTrafficDialog.show();
+//            mNoticeTrafficDialog = new NoticeTrafficDialog(mContext);
+//            mNoticeTrafficDialog.show();
         });
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml
index 96c68a8355..3fdc9dd4c1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml
@@ -24,8 +24,8 @@
         android:layout_marginLeft="@dimen/dp_18"
         android:layout_marginBottom="@dimen/dp_18"
         android:src="@drawable/notice_banner_icon_video"
-        app:layout_constraintBottom_toBottomOf="@+id/notice_push_image"
-        app:layout_constraintLeft_toLeftOf="@+id/notice_push_image" />
+        app:layout_constraintBottom_toBottomOf="@+id/notice_push_style_image"
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <LinearLayout
         android:id="@+id/module_push_app_icon_title"
@@ -46,12 +46,11 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:gravity="center_vertical|left"
-            android:maxWidth="@dimen/dp_184"
-            android:maxLength="25"
             android:singleLine="true"
             android:textColor="@android:color/white"
             android:textSize="@dimen/dp_46"
             app:layout_constrainedWidth="true"
+            android:textStyle="bold"
             tools:text="官方公告" />
 
         <TextView
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 57be068902..c129b62ead 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -18,6 +18,7 @@
     <dimen name="dp_38">38px</dimen>
     <dimen name="dp_42">42px</dimen>
     <dimen name="dp_45">45px</dimen>
+    <dimen name="dp_46">46px</dimen>
     <dimen name="dp_50">50px</dimen>
     <dimen name="dp_52">52px</dimen>
     <dimen name="dp_54">54px</dimen>
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 f24f8060ae..2b9accd28e 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
@@ -18,6 +18,7 @@
     <dimen name="dp_38">38px</dimen>
     <dimen name="dp_42">42px</dimen>
     <dimen name="dp_45">45px</dimen>
+    <dimen name="dp_46">46px</dimen>
     <dimen name="dp_50">50px</dimen>
     <dimen name="dp_52">52px</dimen>
     <dimen name="dp_54">54px</dimen>