Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -24,29 +24,6 @@

            />

        <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"
@@ -82,6 +59,30 @@
                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>

        <!--底部的线,默认隐藏-->
        <View
            android:id="@+id/line_v"