From 4789358cb424eb8cc7c85c4054ee49736daef07d Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Sat, 30 Oct 2021 19:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/notice/NoticeBannerView.java    |  4 ++--
 .../hmi/ui/notice/NoticeTrafficAdapter.java         |  8 +++++---
 .../function/hmi/ui/notice/NoticeTrafficDialog.java | 13 +++++++------
 .../res/layout/notice_dialog_traffic_police.xml     |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

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 b6e284d3d5..95b9104103 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
@@ -60,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/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java
index 7016a2133a..d2d473c0dd 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java
@@ -39,9 +39,11 @@ class NoticeTrafficAdapter extends RecyclerView.Adapter {
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        NoticeValue value = data.get(position);
-        ((TrafficInfoHolder) holder).keyText.setText(value.getKey());
-        ((TrafficInfoHolder) holder).valueText.setText(value.getValue());
+        if (data.size() > position) {
+            NoticeValue value = data.get(position);
+            ((TrafficInfoHolder) holder).keyText.setText(value.getKey());
+            ((TrafficInfoHolder) holder).valueText.setText(value.getValue());
+        }
     }
 
     @Override
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
index 8a14da7768..0f21d0fe2a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
@@ -18,7 +18,7 @@ import java.util.List;
  */
 public class NoticeTrafficDialog extends BaseFloatDialog {
     private Context mContext;
-    private RecyclerView mRecyclerView;
+    private NoticeTrafficInfoView mRecyclerView;
 
     public NoticeTrafficDialog(@NonNull Context context) {
         super(context);
@@ -31,13 +31,14 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
     }
 
     public void initView() {
-        mRecyclerView = findViewById(R.id.traffic_info_recyclerView);
-        //网格布局
-        GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
-        mRecyclerView.setLayoutManager(layoutManager);
-        layoutManager.setOrientation(GridLayoutManager.VERTICAL);
+        setContentView(R.layout.notice_dialog_traffic_police);
         //网格绘制
         try {
+            mRecyclerView = findViewById(R.id.traffic_info_recyclerView);
+            //网格布局
+            GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
+            mRecyclerView.setLayoutManager(layoutManager);
+            layoutManager.setOrientation(GridLayoutManager.VERTICAL);
             NoticeTrafficInfoGridItemDivider gridLayoutDivider = new NoticeTrafficInfoGridItemDivider(1,
                     (mContext.getResources().getColor(R.color.notice_dialog_back)));
             mRecyclerView.addItemDecoration(gridLayoutDivider);
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
index 9968c19c15..997f8fcf9f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
@@ -44,7 +44,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/notice_traffic_dialog_title" />
     <!--事故来源等事故详情-->
-    <androidx.recyclerview.widget.RecyclerView
+    <com.mogo.eagle.core.function.hmi.ui.notice.NoticeTrafficInfoView
         android:id="@+id/traffic_info_recyclerView"
         android:layout_width="@dimen/notice_traffic_info_width"
         android:layout_height="@dimen/notice_traffic_info_height"