From 1beef58a3db5cc1245bb8d91887bdf787b06a6e0 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期四, 06 十一月 2025 17:34:55 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
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 77415dc..f3e8818 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
@@ -167,9 +167,10 @@
//寮�鍚煖闂�
getVM().openGridDriver(selectBean);
downTime = 60;
+ getDB().tvTitle.setVisibility(View.GONE);
break;
case 2:
- getDB().clTip1.setVisibility(View.GONE);
+ //getDB().clTip1.setVisibility(View.GONE);
if(status==0) {
//閲嶆柊寮�闂�
openTime = StringUtil.DateToStr(new Date());
@@ -281,6 +282,12 @@
private SpannableString getErrPhoneText(){
String phone = MApplication.getConfigBean().getLinkPhone();
+ if(phone==null){
+ String text = "濡傛湁闂璇疯仈绯荤鐞嗗憳";
+ SpannableString styledText = new SpannableString(text);
+ styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip3), 0, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return styledText;
+ }
String text = "濡傛湁闂璇疯仈绯荤鐞嗗憳"+phone;
SpannableString styledText = new SpannableString(text);
styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip2), 0, text.length()-phone.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -321,8 +328,7 @@
return;
}
isOpened = true;
- Toast.makeText(mContext, "鎿嶄綔4", Toast.LENGTH_LONG).show();
- doRegister(4, null);
+ getVM().doAction(4);
} else {
//澶辫触
//濡傛灉鏄挜鍖欎笉瀵圭户缁紑闂�
@@ -335,12 +341,12 @@
}
if (!gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
return;
}
}
- doRegister(3, null);
+ getVM().doAction(3);
}
}
}
@@ -385,18 +391,17 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//棰嗗彇澶辫触
isOpened = false;
- doRegister(6, null);
+ getVM().doAction(6);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
- doRegister(10,null);
+ getVM().doAction(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鎷胯蛋浜�
isOpened = false;
- doRegister(5, null);
+ getVM().doAction(5);
getVM().closeGrid(gridDo);
}
}else {
@@ -422,17 +427,17 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//鐩稿悓褰掕繕鎴愬姛
isOpened = false;
- doRegister(8, null);
+ getVM().doAction(8);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鏈綊杩�
isOpened = false;
- doRegister(9, null);
+ getVM().doAction(9);
getVM().closeGrid(gridDo);
}
}else {
@@ -488,25 +493,24 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//棰嗗彇澶辫触
isOpened = false;
- doRegister(6, null);
+ getVM().doAction(6);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
- doRegister(10,null);
+ getVM().doAction(10);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鎷胯蛋浜�
isOpened = false;
- doRegister(5, null);
+ getVM().doAction(5);
getVM().closeGrid(gridDo);
}
}else {
//娌″叧闂�
if(TextUtils.isEmpty(gridDo.getCurKeyCode())){
//绌轰簡
- doRegister(7,null);
+ getVM().doAction(7);
}
}
}else {
@@ -522,24 +526,24 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//鐩稿悓褰掕繕鎴愬姛
isOpened = false;
- doRegister(8, null);
+ getVM().doAction(8);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鏈綊杩�
isOpened = false;
- doRegister(9, null);
+ getVM().doAction(9);
getVM().closeGrid(gridDo);
}
}else {
//娌″叧闂�
if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
//鏈夐挜鍖欎簡
- doRegister(7,null);
+ getVM().doAction(7);
}
}
} else {
--
Gitblit v1.9.3