Merge branch '1.5.1' into dev

wjc

2025-02-07 a1c880c476327032fe174af8c80d6f78a590dae9

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

@@ -1,25 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <LinearLayout
        android:id="@+id/ll_Pop"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
    android:background="@color/text_FF222222"
        android:orientation="vertical">

        <TextView

            android:id="@+id/tv_Camera"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/me_personal_data_photograph"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />
        android:textSize="14sp" />

        <View
            android:layout_width="match_parent"
@@ -30,25 +24,23 @@
            android:id="@+id/tv_Album"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/me_personal_data_select_album"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />
        android:textSize="14sp" />

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_8" />
        android:layout_height="@dimen/dp_20"
        android:background="@color/text_FF000000" />

        <TextView
            android:id="@+id/tv_Cancel"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF333738"
            android:gravity="center"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="16sp" />
        android:textSize="14sp" />

    </LinearLayout>
</LinearLayout>