From 445ba440b32fae364a39b8ef7822ecf3bd4e6abb Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期三, 14 一月 2026 11:29:26 +0800
Subject: [PATCH] 钥匙柜bug修改
---
keyCabinet-android/app/src/main/res/layout/main_activity.xml | 5 +++--
keyCabinet-android/app/build.gradle | 2 +-
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 5 +++++
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java | 4 ++--
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/keyCabinet-android/app/build.gradle b/keyCabinet-android/app/build.gradle
index ff276e1..3058d27 100644
--- a/keyCabinet-android/app/build.gradle
+++ b/keyCabinet-android/app/build.gradle
@@ -11,7 +11,7 @@
minSdkVersion build_versions.min_sdk
targetSdkVersion build_versions.target_sdk
versionCode 2
- versionName "1.0.1"
+ versionName "1.0.2"
//鏀寔vectorDrawables鐭㈤噺鍥�
vectorDrawables.useSupportLibrary = true
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
index 055412b..0366822 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
@@ -147,10 +147,12 @@
}
private boolean isOpening = false;
+ private int doAction;
@Override
protected void doRegister(int type, ActionEventData data) {
stopCountTimer();
downTime = 30;
+ doAction = type;
switch (type){
case 1:
if(selectBean==null){
@@ -470,6 +472,9 @@
public void KeyResultEvent(KeyResultEvent e){
if(!isFinishing()){
if(selectBean!=null){
+ if(doAction==5||doAction==6||doAction==8||doAction==9){
+ return;
+ }
//鏍￠獙鏃堕棿
if(keyTime==null){
return;
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
index 40f82bc..7b81892 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
@@ -344,8 +344,8 @@
}
public void addInfo(String info){
- String s = infoObs.get();
+ /*String s = infoObs.get();
s=info+"\n"+s;
- infoObs.set(s);
+ infoObs.set(s);*/
}
}
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 4b4fc50..4a61d5e 100644
--- a/keyCabinet-android/app/src/main/res/layout/main_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/main_activity.xml
@@ -387,7 +387,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:commandType="@{55}"
- app:onClickCommand="@{model.myTypeCommand}"/>
+ app:onClickCommand="@{model.myTypeCommand}"
+ android:visibility="gone"/>
<ImageView
android:id="@+id/img"
@@ -403,7 +404,7 @@
android:layout_height="50dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
- />
+ android:visibility="gone"/>
<TextView
android:id="@+id/tv_m"
--
Gitblit v1.9.3