From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'

---
 app/src/main/res/layout/toolbar_top_view_44.xml |  105 ++++++++++++++++++++++++----------------------------
 1 files changed, 49 insertions(+), 56 deletions(-)

diff --git a/app/src/main/res/layout/toolbar_top_view_44.xml b/app/src/main/res/layout/toolbar_top_view_44.xml
index 0b23a05..d018155 100644
--- a/app/src/main/res/layout/toolbar_top_view_44.xml
+++ b/app/src/main/res/layout/toolbar_top_view_44.xml
@@ -2,69 +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:layout_height="@dimen/dp_44"
+    android:background="@color/text_FF000000"
     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"
+    <!--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_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">
+    <!--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>
\ No newline at end of file

--
Gitblit v1.8.0