Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,81 +4,27 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/bj"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.QrCodeMainActivity">

    <RelativeLayout
        android:id="@+id/top_bar_view"
<!--    <androidx.constraintlayout.widget.ConstraintLayout-->
<!--        android:layout_width="0dp"-->
<!--        android:layout_height="0dp"-->
<!--        android:background="@drawable/bj"-->
<!--        app:layout_constraintBottom_toBottomOf="parent"-->
<!--        app:layout_constraintEnd_toEndOf="parent"-->
<!--        app:layout_constraintStart_toStartOf="parent"-->
<!--        app:layout_constraintTop_toTopOf="parent" />-->

    <include
        android:id="@+id/toolbar_top_rl"
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:layout_marginTop="@dimen/dp_44"
        android:orientation="horizontal"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <RelativeLayout
            android:id="@+id/top_content_view"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_44"
            android:layout_marginTop="@dimen/dp_10"
            android:orientation="horizontal">
            <!--1.返回按钮 增大点击区域-->
            <LinearLayout
                android:id="@+id/top_back_ll"
                android:layout_width="@dimen/dp_56"
                android:layout_height="match_parent"
                android:gravity="center_vertical"
                android:orientation="horizontal">

                <ImageView
                    android:id="@+id/top_left_iv"
                    android:layout_width="@dimen/dp_30"
                    android:layout_height="@dimen/dp_30"
                    android:layout_gravity="center"
                    android:layout_marginStart="@dimen/dp_16"
                    android:scaleType="centerInside"
                    android:src="@drawable/back" />
            </LinearLayout>

            <!--2.标题文本-->
            <TextView
                android:id="@+id/top_title_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_centerInParent="true"
                android:layout_marginLeft="@dimen/dp_60"
                android:layout_marginRight="@dimen/dp_60"
                android:gravity="center"
                android:maxLines="1"
                android:text=""
                android:textColor="@color/text_E6FFFFFF"
                android:textSize="@dimen/text_18" />

            <!--3.更多按钮 默认隐藏-->
            <LinearLayout
                android:id="@+id/top_more_btn"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_alignParentEnd="true"
                android:gravity="center_vertical"
                android:orientation="horizontal"
                android:src="@drawable/add"
                android:visibility="gone">

                <ImageView
                    android:id="@+id/top_more_iv"
                    android:layout_width="@dimen/dp_28"
                    android:layout_height="@dimen/dp_28"
                    android:layout_marginStart="20dp"
                    android:layout_marginEnd="20dp"
                    android:adjustViewBounds="true"
                    android:scaleType="centerInside" />

            </LinearLayout>

        </RelativeLayout>
    </RelativeLayout>
        app:layout_constraintTop_toTopOf="parent" />


    <RelativeLayout
@@ -91,7 +37,7 @@
        android:background="@drawable/code_box"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/top_bar_view">
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">

        <ImageView
            android:id="@+id/qr_code_iv"
@@ -104,9 +50,9 @@
    <TextView
        android:id="@+id/user_name_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_16"
        android:textColor="@color/text_E6FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_18"
        android:visibility="gone"
        app:layout_constraintEnd_toEndOf="@+id/qr_code_box"
@@ -116,9 +62,9 @@
    <TextView
        android:id="@+id/user_account_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_16"
        android:textColor="@color/text_66FFFFFF"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_8"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="@dimen/text_14"
        android:visibility="gone"
        app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
@@ -129,11 +75,11 @@
        android:id="@+id/save_tv"
        android:layout_width="158dp"
        android:layout_height="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_16"
        android:background="@drawable/selected_8_ff555859"
        android:layout_marginTop="@dimen/dp_50"
        android:background="@drawable/selected_8_ff39383d"
        android:gravity="center"
        android:text="@string/save_to_album"
        android:textColor="@color/text_66FFFFFF"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
        app:layout_constraintStart_toStartOf="@+id/user_name_tv"