From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/res/layout/main_activity.xml | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/keyCabinet-android/app/src/main/res/layout/main_activity.xml b/keyCabinet-android/app/src/main/res/layout/main_activity.xml
index 85e9687..47ce15b 100644
--- a/keyCabinet-android/app/src/main/res/layout/main_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/main_activity.xml
@@ -69,8 +69,7 @@
android:textStyle="bold"
android:layout_marginLeft="56dp"
android:layout_marginRight="56dp"
- app:commandType="@{1}"
- app:onClickCommand="@{model.myTypeCommand}"/>
+ />
<TextView
android:id="@+id/tv_time"
@@ -194,8 +193,7 @@
app:layout_constraintStart_toStartOf="parent"
android:layout_marginLeft="30dp"
android:layout_marginBottom="22dp"
- app:commandType="@{4}"
- app:onClickCommand="@{model.myTypeCommand}"/>
+ />
<TextView
android:id="@+id/tv_version"
@@ -263,5 +261,97 @@
</RelativeLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_tip"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/white"
+ android:visibility="gone">
+
+ <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="@{4}"
+ 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/tv_djs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="10s"
+ android:textColor="#ff279baa"
+ android:textSize="24sp"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginTop="33dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginRight="30dp"/>
+
+ <ImageView
+ android:id="@+id/img_tip2"
+ android:layout_width="300dp"
+ android:layout_height="205dp"
+ android:src="@mipmap/ic_notclose_key"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/viewBack"
+ android:layout_marginTop="67dp"/>
+
+ <TextView
+ android:id="@+id/tv_tip2_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏌滈棬鏈叧闂�"
+ android:textColor="#ff111111"
+ android:textSize="33sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@+id/img_tip2"
+ android:layout_marginTop="18dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ <TextView
+ android:id="@+id/tv_tip2_2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="璇峰叧闂煖闂ㄥ悗鍙栬繕閽ュ寵"
+ android:textColor="#ff666666"
+ android:textSize="24sp"
+ app:layout_constraintTop_toBottomOf="@+id/tv_tip2_1"
+ android:layout_marginTop="22dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.3