From fab8c02a0aa8f941a507bdcb3e4d72deb6eb2242 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 24 十月 2025 14:53:18 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 40 ++++------------------------------------
1 files changed, 4 insertions(+), 36 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 44934c8..f062a3f 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
@@ -55,32 +55,6 @@
private int status;
private int ysDownCount = 10;
- private Handler handler = new Handler(){
- @Override
- public void handleMessage(@NonNull Message msg) {
- switch (msg.what){
- case 0:
- /*if (ysDownCount==4) {
- //棰嗗彇閽ュ寵鍊掕鏃�
- doRegister(7,null);
- ysDownCount--;
- handler.sendEmptyMessageDelayed(0,1000);
- }else if (ysDownCount==0) {
- //棰嗗彇閽ュ寵鍊掕鏃�
- //doRegister(MApplication.nextBoolean()?5:6,null);
- }else {
- ysDownCount--;
- handler.sendEmptyMessageDelayed(0,1000);
- }*/
- break;
- case 1:
-
- break;
- default:
- break;
- }
- }
- };
@Override
public int getLayoutId() {
@@ -203,6 +177,7 @@
getDB().clTip1.setVisibility(View.GONE);
if(status==0) {
//閲嶆柊寮�闂�
+ openTime = StringUtil.DateToStr(new Date());
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
downTime = 60;
@@ -234,7 +209,6 @@
getDB().clTip2.setVisibility(View.VISIBLE);
EventBus.getDefault().post(new GetKeyStatusEvent());
ysDownCount = 8;
- handler.sendEmptyMessageDelayed(0,1000);
break;
case 7:
//鎻愰啋鍏虫煖闂�
@@ -312,7 +286,7 @@
}
private SpannableString getErrPhoneText(){
- String phone = "15899098765";
+ String phone = MApplication.getConfigBean().getLinkPhone();
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);
@@ -340,13 +314,13 @@
if (gridDo != null) {
if(flag==0){
//鍙�
- if(TextUtils.isEmpty(gridDo.getKeyCode())){
+ if(TextUtils.isEmpty(gridDo.getCurKeyCode())){
//绌轰簡
doRegister(7,null);
}
}else {
//杩�
- if(!TextUtils.isEmpty(gridDo.getKeyCode())){
+ if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
//鏈夐挜鍖欎簡
doRegister(7,null);
}
@@ -359,8 +333,6 @@
@Override
protected void onDestroy() {
super.onDestroy();
- handler.removeCallbacksAndMessages(null);
- handler = null;
}
private String openTime = "";
@@ -377,7 +349,6 @@
return;
}
isOpened = true;
- openTime = StringUtil.DateToStr(new Date());
Toast.makeText(mContext, "鎿嶄綔4", Toast.LENGTH_LONG).show();
doRegister(4, null);
} else {
@@ -443,9 +414,6 @@
isOpened = false;
doRegister(5, null);
getVM().closeGrid(gridDo);
- }
- if (handler.hasMessages(0)) {
- handler.removeMessages(0);
}
}else {
Toast.makeText(mContext, "鏈煡璇㈠埌", Toast.LENGTH_LONG).show();
--
Gitblit v1.9.3