Merge branch 'hj' into dev_MogoAP_eagle-1030_211020_8.0.14

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java

@@ -41,8 +41,8 @@ class NoticeTrafficAdapter extends RecyclerView.Adapter {
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         if (data.size() > position) {
             NoticeValue value = data.get(position);
-            ((TrafficInfoHolder) holder).keyText.setText(value.getKey());
+            ((TrafficInfoHolder) holder).keyText.setText("测试title");
-            ((TrafficInfoHolder) holder).valueText.setText(value.getValue());
+            ((TrafficInfoHolder) holder).valueText.setText("当前是测试数据,请查看测试来源");
         }
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java

@@ -8,6 +8,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.module.common.dialog.BaseFloatDialog;
+import com.mogo.module.common.view.SpacesItemDecoration;
+import com.mogo.utils.ResourcesHelper;
 
 import java.util.List;
 
@@ -18,7 +20,7 @@ import java.util.List;
  */
 public class NoticeTrafficDialog extends BaseFloatDialog {
     private Context mContext;
-    private NoticeTrafficInfoView mRecyclerView;
+    private RecyclerView mRecyclerView;
 
     public NoticeTrafficDialog(@NonNull Context context) {
         super(context);
@@ -36,11 +38,11 @@ public class NoticeTrafficDialog extends BaseFloatDialog {
         try {
             mRecyclerView = findViewById(R.id.traffic_info_recyclerView);
             //网格布局
-            GridLayoutManager layoutManager = new GridLayoutManager(mContext, 4);
+            GridLayoutManager layoutManager = new GridLayoutManager(mContext, 2);
             mRecyclerView.setLayoutManager(layoutManager);
             layoutManager.setOrientation(GridLayoutManager.VERTICAL);
             NoticeTrafficInfoGridItemDivider gridLayoutDivider = new NoticeTrafficInfoGridItemDivider(1,
-                    (mContext.getResources().getColor(R.color.notice_dialog_back)));
+                    (mContext.getResources().getColor(R.color.notice_check_dialog_bg_color)));
             mRecyclerView.addItemDecoration(gridLayoutDivider);
         } catch (Exception e) {
             e.printStackTrace();

core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml

@@ -33,7 +33,7 @@
     <!--图/视频-->
     <ImageView
         android:id="@+id/back_image"
-        android:layout_width="@dimen/notice_traffic_acc_image_width"
+        android:layout_width="0dp"
         android:layout_height="@dimen/notice_traffic_acc_image_height"
         android:layout_marginLeft="@dimen/dp_200"
         android:layout_marginTop="@dimen/dp_50"
@@ -44,11 +44,15 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/notice_traffic_dialog_title" />
     <!--事故来源等事故详情-->
-    <com.mogo.eagle.core.function.hmi.ui.notice.NoticeTrafficInfoView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/traffic_info_recyclerView"
-        android:layout_width="@dimen/notice_traffic_info_width"
+        android:layout_width="0dp"
-        android:layout_height="@dimen/notice_traffic_info_height"
+        android:layout_height="0dp"
+        android:layout_marginLeft="@dimen/dp_80"
         android:layout_marginTop="@dimen/dp_38"
+        android:layout_marginRight="@dimen/dp_80"
+        android:layout_marginBottom="@dimen/dp_40"
+        app:layout_constraintBottom_toBottomOf="@+id/traffic_top_line"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/back_image" />
@@ -74,6 +78,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:text="接 受"
         android:textColor="@color/notice_text_blue"
         android:textSize="@dimen/dp_50"
@@ -86,6 +91,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:text="拒 绝"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_50"

core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_traffice_info_list_adapter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="@dimen/dp_580"
+    android:layout_width="@dimen/dp_575"
     android:layout_height="wrap_content">
 
     <LinearLayout
@@ -23,11 +23,11 @@
 
         <TextView
             android:id="@+id/value_text_view"
-            android:layout_width="@dimen/dp_180"
+            android:layout_width="@dimen/dp_395"
             android:layout_height="wrap_content"
             android:gravity="left|center"
             android:maxLines="2"
-            android:text="平台发布平台发布平台发布平台发布"
+            android:text="测试数据"
             android:textColor="#FFF"
             android:textSize="@dimen/dp_36"
             android:textStyle="bold" />

core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -8,7 +8,7 @@
     <dimen name="notice_traffic_acc_image_height">506px</dimen>
     <dimen name="notice_traffic_back__width">1300px</dimen>
     <dimen name="notice_traffic_back__height">1210px</dimen>
-    <dimen name="notice_traffic_info_width">1160px</dimen>
+    <dimen name="notice_traffic_info_width">1150px</dimen>
     <dimen name="notice_traffic_info_height">290px</dimen>
 
     <dimen name="notice_dialog_check_bg_corner">32px</dimen>
@@ -24,11 +24,12 @@
     <dimen name="dp_54">54px</dimen>
     <dimen name="dp_56">56px</dimen>
     <dimen name="dp_62">62px</dimen>
+    <dimen name="dp_75">80px</dimen>
     <dimen name="dp_150">150px</dimen>
     <dimen name="dp_180">180px</dimen>
     <dimen name="dp_220">220px</dimen>
+    <dimen name="dp_395">395px</dimen>
     <dimen name="dp_580">580px</dimen>
     <dimen name="dp_588">588px</dimen>
     <dimen name="dp_1066">1066px</dimen>
-
 </resources>

core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml

@@ -8,7 +8,7 @@
     <dimen name="notice_traffic_acc_image_height">506px</dimen>
     <dimen name="notice_traffic_back__width">1300px</dimen>
     <dimen name="notice_traffic_back__height">1210px</dimen>
-    <dimen name="notice_traffic_info_width">1160px</dimen>
+    <dimen name="notice_traffic_info_width">1150px</dimen>
     <dimen name="notice_traffic_info_height">290px</dimen>
 
     <dimen name="notice_dialog_check_bg_corner">32px</dimen>
@@ -24,9 +24,11 @@
     <dimen name="dp_54">54px</dimen>
     <dimen name="dp_56">56px</dimen>
     <dimen name="dp_62">62px</dimen>
+    <dimen name="dp_75">80px</dimen>
     <dimen name="dp_150">150px</dimen>
     <dimen name="dp_180">180px</dimen>
     <dimen name="dp_220">220px</dimen>
+    <dimen name="dp_395">395px</dimen>
     <dimen name="dp_580">580px</dimen>
     <dimen name="dp_588">588px</dimen>
     <dimen name="dp_1066">1066px</dimen>