From 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 10 十二月 2025 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml b/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml
index e2655a4..f1ed265 100644
--- a/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml
@@ -28,6 +28,42 @@
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="30dp"/>
+ <View
+ android:id="@+id/viewBack"
+ android:layout_width="0dp"
+ android:layout_height="60dp"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginTop="22dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/tv_back"
+ android:layout_marginRight="-22dp"
+ android:background="@drawable/shape_r20_back"
+ app:commandType="@{1}"
+ app:onClickCommand="@{model.myTypeCommand}"/>
+
+ <ImageView
+ android:id="@+id/im_back"
+ android:layout_width="14dp"
+ android:layout_height="22dp"
+ android:src="@mipmap/ic_back"
+ app:layout_constraintTop_toTopOf="@+id/viewBack"
+ app:layout_constraintBottom_toBottomOf="@+id/viewBack"
+ app:layout_constraintStart_toStartOf="@+id/viewBack"
+ android:layout_marginLeft="22dp"/>
+
+ <TextView
+ android:id="@+id/tv_back"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="杩斿洖"
+ android:textStyle="bold"
+ android:textColor="#ffffffff"
+ android:textSize="26sp"
+ android:layout_marginLeft="6dp"
+ app:layout_constraintTop_toTopOf="@+id/viewBack"
+ app:layout_constraintBottom_toBottomOf="@+id/viewBack"
+ app:layout_constraintLeft_toRightOf="@+id/im_back"/>
+
<TextView
android:id="@+id/tv1"
android:layout_width="wrap_content"
@@ -37,7 +73,7 @@
android:textSize="22sp"
app:layout_constraintTop_toTopOf="@+id/tv_title"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
- app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
android:layout_marginLeft="30dp"/>
<TextView
@@ -49,24 +85,6 @@
android:textSize="22sp"
app:layout_constraintTop_toTopOf="@+id/tv1"
app:layout_constraintStart_toEndOf="@+id/tv1"/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="閫�鍑虹櫥褰�"
- android:textColor="#ff279baa"
- android:textSize="22sp"
- app:layout_constraintEnd_toEndOf="parent"
- android:paddingTop="7dp"
- android:paddingBottom="7dp"
- android:paddingLeft="15dp"
- android:paddingRight="15dp"
- android:background="@drawable/shape_r45_tc_bg"
- app:layout_constraintTop_toTopOf="@+id/tv_title"
- app:layout_constraintBottom_toBottomOf="@+id/tv_title"
- app:commandType="@{1}"
- app:onClickCommand="@{model.myTypeCommand}"
- android:layout_marginRight="30dp"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_1"
--
Gitblit v1.9.3