From baf5a1f168e7ffdae45fdf568073c104b59c4b61 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 31 Oct 2022 21:27:10 +0800
Subject: [PATCH] =?UTF-8?q?[2.8.0-f]=20him=20ui=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/logcatch/LogItemAdapter.java       |  2 +
 .../src/main/res/layout/item_ipc_report.xml   | 48 +++++++++----------
 .../src/main/res/layout/item_log.xml          | 10 ++--
 .../src/main/res/layout/log_view.xml          |  5 +-
 .../res/layout/notice_module_dialog_check.xml | 44 -----------------
 .../res/layout/view_ap_badcase_entrance.xml   | 11 -----
 .../view_brake_light_status_daytime.xml       |  4 +-
 .../src/main/res/values/styles.xml            |  2 +-
 8 files changed, 37 insertions(+), 89 deletions(-)
 delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_module_dialog_check.xml
 delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ap_badcase_entrance.xml

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogItemAdapter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogItemAdapter.java
index 122924cb0f..0a74ef7c99 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogItemAdapter.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogItemAdapter.java
@@ -23,6 +23,8 @@ import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.hmi.ui.utils.SearchCriteria;
 import com.mogo.eagle.core.function.hmi.ui.utils.TagColorUtil;
 
+import me.jessyan.autosize.AutoSizeCompat;
+
 
 public class LogItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<LogLine>, LogLine> implements Filterable {
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ipc_report.xml
index 1710d1291f..4d3fe403db 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ipc_report.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_ipc_report.xml
@@ -11,10 +11,10 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
+        android:textSize="@dimen/dp_31"
         android:text="@string/ipc_report_time"
-        android:layout_marginTop="10dp"
-        android:layout_marginStart="10dp"
+        android:layout_marginTop="26dp"
+        android:layout_marginStart="26dp"
         />
 
     <TextView
@@ -24,9 +24,9 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@id/tvReportTimeTitle"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="10dp"
+        android:textSize="@dimen/dp_31"
+        android:layout_marginTop="26dp"
+        android:layout_marginEnd="26dp"
         />
 
     <TextView
@@ -36,10 +36,10 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReportTimeTitle"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
+        android:textSize="@dimen/dp_31"
         android:text="@string/ipc_report_type"
-        android:layout_marginTop="10dp"
-        android:layout_marginStart="10dp"
+        android:layout_marginTop="26dp"
+        android:layout_marginStart="26dp"
         />
 
     <TextView
@@ -50,9 +50,9 @@
         app:layout_constraintLeft_toRightOf="@id/tvReportResultTitle"
         app:layout_constraintRight_toRightOf="parent"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
+        android:textSize="@dimen/dp_31"
         android:minLines="1"
-        android:layout_marginEnd="10dp"
+        android:layout_marginEnd="26dp"
         />
 
     <TextView
@@ -62,10 +62,10 @@
         app:layout_constraintTop_toBottomOf="@id/tvReportResultContent"
         app:layout_constraintLeft_toLeftOf="parent"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
+        android:textSize="@dimen/dp_31"
         android:text="@string/ipc_report_msg"
-        android:layout_marginTop="10dp"
-        android:layout_marginStart="10dp"
+        android:layout_marginTop="26dp"
+        android:layout_marginStart="26dp"
         />
 
     <TextView
@@ -77,8 +77,8 @@
         app:layout_constraintRight_toRightOf="parent"
         android:minLines="1"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
-        android:layout_marginEnd="10dp"
+        android:textSize="@dimen/dp_31"
+        android:layout_marginEnd="26dp"
         />
 
     <TextView
@@ -88,10 +88,10 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvReportMsgContent"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
+        android:textSize="@dimen/dp_31"
         android:text="@string/ipc_report_action"
-        android:layout_marginTop="10dp"
-        android:layout_marginStart="10dp"
+        android:layout_marginTop="26dp"
+        android:layout_marginStart="26dp"
         />
 
     <TextView
@@ -103,8 +103,8 @@
         app:layout_constraintRight_toRightOf="parent"
         android:minLines="1"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
-        android:layout_marginEnd="10dp"
+        android:textSize="@dimen/dp_31"
+        android:layout_marginEnd="26dp"
         />
 
     <View
@@ -113,10 +113,10 @@
         android:background="#F0F0F0"
         app:layout_constraintTop_toBottomOf="@id/tvReportActionContent"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="16sp"
+        android:textSize="@dimen/dp_31"
         android:layout_marginTop="5dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginStart="26dp"
+        android:layout_marginEnd="26dp"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_log.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_log.xml
index 5f25b129d3..0cbe045e77 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_log.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_log.xml
@@ -17,7 +17,7 @@
         android:paddingRight="2dp"
         android:singleLine="true"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_24" />
 
     <TextView
         android:id="@+id/timestamp_text"
@@ -29,7 +29,7 @@
         android:paddingRight="2dp"
         android:singleLine="true"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_24" />
 
     <TextView
         android:id="@+id/tag_text"
@@ -43,7 +43,7 @@
         android:paddingRight="2dp"
         android:singleLine="true"
         android:textColor="@color/color_000000"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_24" />
 
     <TextView
         android:id="@+id/log_level_text"
@@ -54,7 +54,7 @@
         android:layout_toRightOf="@+id/tag_text"
         android:gravity="center_horizontal"
         android:singleLine="true"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_24" />
 
 
     <TextView
@@ -68,7 +68,7 @@
         android:paddingLeft="2dp"
         android:paddingRight="2dp"
         android:singleLine="true"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_24" />
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml
index dc841904bc..f31d954e74 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml
@@ -14,7 +14,7 @@
         <com.mogo.eagle.core.function.hmi.ui.logcatch.LogTitleBar
             android:id="@+id/title_bar"
             android:layout_width="match_parent"
-            android:layout_height="68dp"
+            android:layout_height="120dp"
             android:layout_alignParentTop="true"
             android:background="#ffffff"
             app:Back="@string/log_min"
@@ -31,7 +31,7 @@
         <EditText
             android:id="@+id/log_filter"
             style="@style/Input"
-            android:layout_height="50dp"
+            android:layout_height="100dp"
             android:layout_below="@id/view_divider"
             android:layout_marginLeft="16dp"
             android:layout_marginTop="15dp"
@@ -159,6 +159,7 @@
         android:background="#337CC4"
         android:singleLine="true"
         android:text="@string/log_info"
+        android:textSize="@dimen/dp_24"
         android:visibility="gone" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_module_dialog_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_module_dialog_check.xml
deleted file mode 100644
index 8e6759c085..0000000000
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_module_dialog_check.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/module_push_dialog_check_width"
-    android:layout_height="@dimen/module_push_dialog_check_height">
-
-    <ImageView
-        android:id="@+id/module_push_dialog_close"
-        android:layout_width="@dimen/module_push_dialog_close_width"
-        android:layout_height="@dimen/module_push_dialog_close_height"
-        android:layout_marginLeft="@dimen/module_push_dialog_close_margin"
-        android:layout_marginTop="@dimen/module_push_dialog_close_margin"
-        android:scaleType="fitXY"
-        android:src="@drawable/module_push_dialog_close"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/module_push_dialog_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_push_dialog_title_margin"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_push_dialog_title_size"
-        android:text="官方公告"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/module_push_dialog_content"
-        android:layout_width="@dimen/module_push_dialog_content_width"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_push_dialog_content_margin_top"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/module_push_dialog_content_size"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/module_push_dialog_title" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ap_badcase_entrance.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ap_badcase_entrance.xml
deleted file mode 100644
index d77bcfe7a3..0000000000
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ap_badcase_entrance.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:elevation="@dimen/dp_10"
-    android:scaleType="center"
-    tools:layout_width="@dimen/module_hmi_check_size"
-    tools:layout_height="@dimen/module_hmi_check_size"
-    android:background="@drawable/icon_car_ap_badcase_entrance" />
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml
index 2be534da7a..a73b3c4d03 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_brake_light_status_daytime.xml
@@ -19,8 +19,8 @@
 
         <ImageView
             android:id="@+id/image_brake"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_74"
+            android:layout_height="@dimen/dp_74"
             android:layout_gravity="center_vertical"
             android:src="@drawable/bus_shache_nor_daytime"
             android:layout_marginLeft="15dp"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
index da5c3588b4..035df811a8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles.xml
@@ -11,7 +11,7 @@
     <style name="TitleBig">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">@dimen/dp_48</item>
+        <item name="android:textSize">@dimen/dp_24</item>
         <item name="android:textColor">#324456</item>
         <item name="android:gravity">center</item>
         <item name="android:textStyle">bold</item>