Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -15,38 +15,15 @@
        <TextView
            android:id="@+id/sll_ll_rl_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_21"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/set_nickname"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_15"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14"

            />

        <LinearLayout
            android:id="@+id/sll_ll_rl_right_icon_ll"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_13">
            <!--标准图标-->
            <ImageView
                android:id="@+id/sll_ll_rl_right_next_iv"
                android:layout_width="@dimen/dp_16"
                android:layout_height="@dimen/dp_16"
                android:src="@drawable/next" />
            <!--特殊图标-->
            <ImageView
                android:id="@+id/sll_ll_rl_right_switch_iv"
                android:layout_width="@dimen/dp_57"
                android:layout_height="@dimen/dp_31"
                android:src="@drawable/switch_on_off"
                android:visibility="gone" />


        </LinearLayout>

        <LinearLayout
            android:layout_width="wrap_content"
@@ -75,11 +52,35 @@
            <TextView
                android:id="@+id/sll_ll_rl_right_content_tv"
                android:layout_width="wrap_content"
                android:layout_height="@dimen/dp_21"
                android:layout_height="wrap_content"
                android:gravity="end"
                android:textColor="@color/text_7C8590"
                android:textSize="@dimen/text_15"
                android:textColor="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14"
                android:visibility="gone" />
        </LinearLayout>

        <LinearLayout
            android:id="@+id/sll_ll_rl_right_icon_ll"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_13">
            <!--标准图标-->
            <ImageView
                android:id="@+id/sll_ll_rl_right_next_iv"
                android:layout_width="@dimen/dp_16"
                android:layout_height="@dimen/dp_16"
                android:src="@drawable/next" />
            <!--特殊图标-->
            <ImageView
                android:id="@+id/sll_ll_rl_right_switch_iv"
                android:layout_width="@dimen/dp_57"
                android:layout_height="@dimen/dp_31"
                android:src="@drawable/switch_on_off"
                android:visibility="gone" />


        </LinearLayout>

        <!--底部的线,默认隐藏-->
@@ -88,7 +89,7 @@
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:layout_alignParentBottom="true"
            android:background="@color/text_E1E1E1"
            android:background="@color/text_1AFFFFFF"
            android:visibility="gone"

            />