Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -33,7 +33,8 @@
                    android:layout_height="wrap_content"
                    android:layout_centerInParent="true"
                    android:text="@string/me"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"

                    android:textSize="@dimen/text_18" />


@@ -78,7 +79,7 @@
                        android:gravity="end|center_vertical"
                        android:paddingStart="@dimen/dp_0"
                        android:paddingEnd="@dimen/dp_3"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textColor="@color/text_FFACACAC"
                        android:textSize="@dimen/text_18" />

                    <ImageView
@@ -108,7 +109,7 @@
                        android:gravity="end|center_vertical"
                        android:paddingStart="@dimen/dp_0"
                        android:paddingEnd="@dimen/dp_3"
                        android:textColor="@color/text_66FFFFFF"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textSize="@dimen/text_14" />

                    <ImageView
@@ -133,13 +134,14 @@
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
                <!--设备调试-->
                <!--主账号才显示-->
                <include
                    android:id="@+id/fragment_me_line_device_debug_il"
                    layout="@layout/fragment_me_line" />
                <!--主账号才显示-->
                <include
                    android:id="@+id/fragment_me_line_user_management_il"
                    layout="@layout/fragment_me_line" />

<!--                <include-->
<!--                    android:id="@+id/fragment_me_line_user_management_il"-->
<!--                    layout="@layout/fragment_me_line" />-->

                <include
                    android:id="@+id/fragment_me_line_set_il"