Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -2,70 +2,62 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/top_bar_view"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_54"
    android:orientation="horizontal"
    >

    <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:layout_height="@dimen/dp_44"
    android:background="@color/text_FF000000"
    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">
        <!--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_24"
                android:layout_height="@dimen/dp_24"
                android:layout_gravity="center"
                android:layout_marginStart="@dimen/dp_16"
                android:scaleType="centerInside" />
        </LinearLayout>
        <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_10"
            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:fontFamily="sans-serif-medium"
            android:gravity="center"
            android:maxLines="1"
            android:text=""
            android:textColor="@color/text_FF000000"
            android:textSize="@dimen/text_18" />
    <!--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_FFACACAC"
        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">
    <!--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" />
        <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>
    </LinearLayout>

    </RelativeLayout>

</RelativeLayout>