Merge branch 'wjc' into dev-hxb

mac

2024-02-20 dc8ae12444d1d887394eb525e2b80dd120dc4c87

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

@@ -43,7 +43,7 @@
                    app:layout_constraintTop_toTopOf="parent" />

                <View
                    android:id="@+id/line2_v"
                    android:id="@+id/line1_v"
                    android:layout_width="0dp"
                    android:layout_height="3dp"
                    android:layout_marginTop="@dimen/dp_11"
@@ -75,7 +75,7 @@
                    app:layout_constraintTop_toTopOf="parent" />

                <View
                    android:id="@+id/line3_v"
                    android:id="@+id/line2_v"
                    android:layout_width="0dp"
                    android:layout_height="3dp"
                    android:layout_marginTop="@dimen/dp_11"
@@ -86,12 +86,13 @@


            </androidx.constraintlayout.widget.ConstraintLayout>
            <!--全部-->
            <!--全部 2023年12月29日09:49:59阿廖要求先隐藏-->
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/message_tab_all_cl"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1">
                android:layout_weight="1"
                android:visibility="gone">

                <TextView
                    android:id="@+id/message_tab_all_title_tv"
@@ -107,7 +108,7 @@
                    app:layout_constraintTop_toTopOf="parent" />

                <View
                    android:id="@+id/line1_v"
                    android:id="@+id/line3_v"
                    android:layout_width="0dp"
                    android:layout_height="3dp"
                    android:layout_marginTop="@dimen/dp_11"