diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml index 12a226d8e9..085dff6d6e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml @@ -1,28 +1,28 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml index 2e26a4ebc0..5911e16c42 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml @@ -1,27 +1,27 @@ @@ -56,11 +56,11 @@ app:layout_constraintLeft_toLeftOf="@id/tvReportTimeNormal" app:layout_constraintRight_toRightOf="@id/tvStatusSelect" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginTop="5px" - android:layout_marginBottom="25px" + android:layout_marginTop="5dp" + android:layout_marginBottom="25dp" android:textColor="#B3FFFFFF" android:gravity="start" - android:textSize="28px" + android:textSize="28dp" android:maxLines="1" android:ellipsize="end" android:lineSpacingMultiplier="1.2" @@ -72,18 +72,18 @@ android:layout_height="wrap_content" android:text="折叠" android:textColor="#FFFFFFFF" - android:textSize="24px" + android:textSize="24dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintRight_toRightOf="parent" - android:layout_marginTop="25px" - android:layout_marginEnd="25px" + android:layout_marginTop="25dp" + android:layout_marginEnd="25dp" android:background="@drawable/bg_msg_status_select" android:drawableStart="@drawable/icon_msg_open" - android:drawablePadding="10px" - android:paddingStart="15px" - android:paddingEnd="15px" - android:paddingTop="5px" - android:paddingBottom="5px" + android:drawablePadding="10dp" + android:paddingStart="15dp" + android:paddingEnd="15dp" + android:paddingTop="5dp" + android:paddingBottom="5dp" /> @@ -118,8 +118,8 @@ app:layout_constraintBottom_toBottomOf="@id/ivReportImageOpen" app:layout_constraintLeft_toRightOf="@id/ivReportImageOpen" android:textColor="#FFFFFFFF" - android:textSize="32px" - android:layout_marginStart="10px" + android:textSize="32dp" + android:layout_marginStart="10dp" android:visibility="gone" /> @@ -129,9 +129,9 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/ivReportImageOpen" app:layout_constraintLeft_toLeftOf="@id/ivReportImageOpen" - android:layout_marginTop="10px" + android:layout_marginTop="10dp" android:textColor="#B3FFFFFF" - android:textSize="28px" + android:textSize="28dp" android:lineSpacingMultiplier="1.2" android:visibility="gone" /> @@ -143,7 +143,7 @@ app:layout_constraintTop_toBottomOf="@id/tvReportTimeOpen" app:layout_constraintLeft_toLeftOf="@id/tvReportTimeOpen" android:textColor="#B3FFFFFF" - android:textSize="28px" + android:textSize="28dp" android:lineSpacingMultiplier="1.2" android:visibility="gone" /> @@ -157,7 +157,7 @@ app:layout_constraintRight_toRightOf="@id/tvStatusSelect" android:gravity="start" android:textColor="#B3FFFFFF" - android:textSize="28px" + android:textSize="28dp" android:lineSpacingMultiplier="1.2" android:visibility="gone" /> @@ -170,9 +170,9 @@ app:layout_constraintLeft_toLeftOf="@id/tvReportReasonOpen" app:layout_constraintRight_toRightOf="@id/tvStatusSelect" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="15px" + android:layout_marginBottom="15dp" android:textColor="#B3FFFFFF" - android:textSize="28px" + android:textSize="28dp" android:lineSpacingMultiplier="1.2" android:visibility="gone" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml index 38b8988e07..9506d06130 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml @@ -1,25 +1,25 @@ @@ -29,10 +29,10 @@ android:layout_height="wrap_content" android:text="官方公告" android:textColor="#FFFFFFFF" - android:textSize="32px" + android:textSize="32dp" app:layout_constraintTop_toTopOf="@id/ivNoticeImage" app:layout_constraintLeft_toRightOf="@id/ivNoticeImage" - android:layout_marginStart="15px" + android:layout_marginStart="15dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml index 8537e5d213..375a39975f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml @@ -1,27 +1,27 @@ @@ -34,8 +34,8 @@ app:layout_constraintLeft_toRightOf="@id/ivOperationImageNormal" android:text="运营平台" android:textColor="#FFFFFFFF" - android:textSize="32px" - android:layout_marginStart="23px" + android:textSize="32dp" + android:layout_marginStart="23dp" /> @@ -61,18 +61,18 @@ android:layout_height="wrap_content" android:text="折叠" android:textColor="#FFFFFFFF" - android:textSize="24px" + android:textSize="24dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintRight_toRightOf="parent" - android:layout_marginTop="25px" - android:layout_marginEnd="25px" + android:layout_marginTop="25dp" + android:layout_marginEnd="25dp" android:background="@drawable/bg_msg_status_select" android:drawableStart="@drawable/icon_msg_open" - android:drawablePadding="10px" - android:paddingStart="15px" - android:paddingEnd="15px" - android:paddingTop="5px" - android:paddingBottom="5px" + android:drawablePadding="10dp" + android:paddingStart="15dp" + android:paddingEnd="15dp" + android:paddingTop="5dp" + android:paddingBottom="5dp" /> @@ -108,8 +108,8 @@ app:layout_constraintLeft_toRightOf="@id/ivOperationImageOpen" android:text="运营平台" android:textColor="#FFFFFFFF" - android:textSize="32px" - android:layout_marginStart="10px" + android:textSize="32dp" + android:layout_marginStart="10dp" android:visibility="gone" /> @@ -122,11 +122,11 @@ app:layout_constraintLeft_toLeftOf="@id/ivOperationImageOpen" app:layout_constraintRight_toRightOf="@id/tvOperationStatusSelect" android:gravity="start" - android:layout_marginTop="10px" - android:layout_marginBottom="15px" + android:layout_marginTop="10dp" + android:layout_marginBottom="15dp" android:lineSpacingMultiplier="1.2" android:textColor="#B3FFFFFF" - android:textSize="28px" + android:textSize="28dp" android:visibility="gone" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml index 808e8e2396..ef36f539a0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml @@ -1,24 +1,24 @@ + android:layout_marginStart="30dp" + android:layout_marginEnd="30dp" + android:layout_marginTop="7dp" + android:layout_marginBottom="7dp"> + android:layout_margin="25dp"/> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml index d88358219c..2496ec595f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_notice.xml @@ -1,24 +1,23 @@ @@ -28,10 +27,10 @@ android:layout_height="wrap_content" android:text="官方公告" android:textColor="#FFFFFFFF" - android:textSize="32px" + android:textSize="32dp" app:layout_constraintTop_toTopOf="@id/ivNoticeImage" app:layout_constraintLeft_toRightOf="@id/ivNoticeImage" - android:layout_marginStart="15px" + android:layout_marginStart="15dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml index e7e45d6527..af25aec755 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml @@ -1,22 +1,22 @@ + android:layout_marginTop="7dp" + android:layout_marginBottom="7dp"> @@ -27,9 +27,9 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/tvBubbleOperationContent" app:layout_constraintLeft_toRightOf="@id/ivBubbleOperationImage" - android:layout_marginStart="25px" + android:layout_marginStart="25dp" android:textColor="#FFFFFFFF" - android:textSize="32px" + android:textSize="32dp" android:text="运营平台" /> @@ -40,9 +40,9 @@ app:layout_constraintTop_toTopOf="@id/tvBubbleOperationTitle" app:layout_constraintBottom_toBottomOf="@id/tvBubbleOperationTitle" app:layout_constraintRight_toRightOf="parent" - android:layout_marginEnd="25px" + android:layout_marginEnd="25dp" android:textColor="#80FFFFFF" - android:textSize="24px" + android:textSize="24dp" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml index ed451de81e..ac287b1ca2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml @@ -1,23 +1,23 @@ @@ -27,10 +27,10 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toRightOf="@id/ivBubbleReportImage" - android:layout_marginTop="15px" - android:layout_marginStart="25px" + android:layout_marginTop="15dp" + android:layout_marginStart="25dp" android:textColor="#FFFFFFFF" - android:textSize="32px" + android:textSize="32dp" android:text="Error" /> @@ -40,9 +40,9 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvBubbleReportTitle" app:layout_constraintLeft_toLeftOf="@id/tvBubbleReportTitle" - android:layout_marginTop="5px" + android:layout_marginTop="5dp" android:textColor="#B3FFFFFF" - android:textSize="28px" + android:textSize="28dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_v2x.xml index a3ba2a9c73..8c1cb8475d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_v2x.xml @@ -1,22 +1,22 @@ + android:layout_marginTop="7dp" + android:layout_marginBottom="7dp"> + android:layout_margin="25dp"/> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml index 8a26d7a513..30d71f2364 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml @@ -1,18 +1,18 @@ @@ -47,7 +47,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:textColor="#FFFFFFFF" - android:textSize="28px" + android:textSize="28dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/tvPassengerNoticeTitle" app:layout_constraintTop_toBottomOf="@id/tvPassengerNoticeTitle" @@ -59,11 +59,11 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml index fd7c05db5a..d7096b95b6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml @@ -1,21 +1,21 @@ + app:roundLayoutRadius="24dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp"> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_notice.xml index b56115e291..d65de843e3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_notice.xml @@ -1,13 +1,13 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml index 0e8088cae4..a323fe7515 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml @@ -1,13 +1,13 @@ \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml index ed5d0dab45..db4163466c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml @@ -1,6 +1,6 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml index ac09584e77..542619f7ea 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_bubble.xml @@ -1,7 +1,7 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml index 74431ca542..053b089c8c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml @@ -1,12 +1,12 @@ + android:layout_marginBottom="16dp"> \ No newline at end of file