Merge branch 'dev' into feature/v1.4.1

mac

2024-06-05 31de722a45e886eae89cfea2f1740c1f4d3b0216

 app/src/main/res/layout/fragment_message.xml

@@ -3,12 +3,13 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/message_parent"
    android:layout_width="match_parent"
    android:background="@drawable/bj"
    android:layout_height="match_parent">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/message_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_31"
        android:layout_height="@dimen/dp_36"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_44"
        android:layout_marginEnd="@dimen/dp_16"
@@ -23,7 +24,7 @@
            android:layout_centerVertical="true"
            android:gravity="center_vertical"
            android:text="@string/message_nascent"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_20"
            android:textStyle="bold" />

@@ -38,7 +39,7 @@
            android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
            android:gravity="start|center_vertical"
            android:text="@string/alarm_record"
            android:textColor="@color/text_40000000"
            android:textColor="@color/text_66000000"
            android:textSize="@dimen/text_16"

            />
@@ -101,8 +102,8 @@
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/power_station_search_iv"
                    android:text="Search the message"
                    android:textColor="@color/text_40000000"
                    android:text="@string/enter_alarm_name"
                    android:textColor="@color/text_66000000"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>

@@ -142,7 +143,7 @@
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_20"
                            android:text="@string/alarm_all_device"
                            android:textColor="@color/text_90000000"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_14" />

                        <View
@@ -178,7 +179,7 @@
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_20"
                            android:text="@string/alarm_all_grade"
                            android:textColor="@color/text_90000000"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_14" />

                        <View
@@ -190,7 +191,7 @@
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:layout_marginStart="@dimen/dp_7"
                            android:background="@drawable/up" />
                            android:background="@drawable/down" />
                    </LinearLayout>


@@ -214,7 +215,7 @@
                            android:layout_height="@dimen/dp_20"
                            android:layout_marginEnd="@dimen/dp_7"
                            android:text="@string/alarm_all_time"
                            android:textColor="@color/text_90000000"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_14" />

                        <View
@@ -225,7 +226,7 @@
                            android:id="@+id/all_time_title_iv"
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:background="@drawable/up" />
                            android:background="@drawable/down" />
                    </LinearLayout>