From 0cc81c61f36d0072b6252737e3d106ba0d4518a3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 10:10:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 171 +++++++++++++++++++++++++++++---------------------------
1 files changed, 89 insertions(+), 82 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..b9a76ca 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
@@ -26,12 +26,15 @@
import com.doumee.keyCabinet.event.KeyResultEvent;
import com.doumee.keyCabinet.event.GetKeyStatusEvent;
import com.doumee.keyCabinet.event.OpenGridEvent;
+import com.doumee.keyCabinet.event.OpenGridListEvent;
import com.doumee.keyCabinet.event.OpenGridOneResultEvent;
import com.doumee.keyCabinet.ui.keyCabinet.adapter.CabinetRcvAdapter;
import com.doumee.keyCabinet.utils.i485.SportUtils;
import com.doumee.lib_coremodel.bean.event.ActionEventData;
import com.doumee.lib_coremodel.util.RecyclerHelp;
import com.doumee.lib_coremodel.util.StringUtil;
+import com.doumee.lib_coremodel.view.ToastView;
+import com.example.datalibrary.utils.ToastUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -55,32 +58,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() {
@@ -132,7 +109,6 @@
for(CabinetGridDo d:gridDos){
oldMap.put(d.getGridKey(),d);
}
- List<CabinetGridDo> addList = new ArrayList<>();
List<CabinetGridDo> updateList = new ArrayList<>();
for(KeyCabinetBean bean:beans){
String key = SportUtils.intToHex(Integer.parseInt(bean.getBoardCode()))+SportUtils.intToHex(Integer.parseInt(bean.getChannelCode()));
@@ -148,23 +124,7 @@
gridDo.setKeyStatus(bean.getKeyStatus());
gridDo.setWorkingStatus(bean.getWorkingStatus());
updateList.add(gridDo);
- }else {
- //鏂板
- CabinetGridDo gridDo = new CabinetGridDo();
- gridDo.setGridId(bean.getId());
- gridDo.setCabinetName(bean.getCode());
- gridDo.setGridKey(key);
- gridDo.setKeyCode(bean.getKeyCode());
- gridDo.setBindStatus(bean.getBindStatus());
- gridDo.setGridStatus(bean.getStatus());
- gridDo.setKeyStatus(bean.getKeyStatus());
- gridDo.setWorkingStatus(bean.getWorkingStatus());
- gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
- addList.add(gridDo);
}
- }
- if(addList.size()>0){
- DaoManager.getCabinetGridDao().insert(addList);
}
if(updateList.size()>0){
CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
@@ -203,6 +163,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 +195,6 @@
getDB().clTip2.setVisibility(View.VISIBLE);
EventBus.getDefault().post(new GetKeyStatusEvent());
ysDownCount = 8;
- handler.sendEmptyMessageDelayed(0,1000);
break;
case 7:
//鎻愰啋鍏虫煖闂�
@@ -312,7 +272,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);
@@ -328,39 +288,9 @@
}
}
- @Subscribe(threadMode= ThreadMode.MAIN)
- public void KeyResultEvent(KeyResultEvent e){
- if(!isFinishing()){
- //閽ュ寵鍙樻洿浜�
- if(selectBean!=null) {
- String key = SportUtils.intToHex(Integer.parseInt(selectBean.getBoardCode()))
- + SportUtils.intToHex(Integer.parseInt(selectBean.getChannelCode()));
- //鏌ヨ鏌滄牸
- CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
- if (gridDo != null) {
- if(flag==0){
- //鍙�
- if(TextUtils.isEmpty(gridDo.getKeyCode())){
- //绌轰簡
- doRegister(7,null);
- }
- }else {
- //杩�
- if(!TextUtils.isEmpty(gridDo.getKeyCode())){
- //鏈夐挜鍖欎簡
- doRegister(7,null);
- }
- }
- }
- }
- }
- }
-
@Override
protected void onDestroy() {
super.onDestroy();
- handler.removeCallbacksAndMessages(null);
- handler = null;
}
private String openTime = "";
@@ -377,7 +307,6 @@
return;
}
isOpened = true;
- openTime = StringUtil.DateToStr(new Date());
Toast.makeText(mContext, "鎿嶄綔4", Toast.LENGTH_LONG).show();
doRegister(4, null);
} else {
@@ -408,6 +337,8 @@
@Subscribe(threadMode= ThreadMode.MAIN)
public void CloseGridOneResultEvent(CloseGridOneResultEvent e){
if(!isFinishing()){
+ //鑾峰彇鍗″彿
+ EventBus.getDefault().post(new GetKeyStatusEvent());
if(selectBean!=null){
String key = SportUtils.intToHex(Integer.parseInt(selectBean.getBoardCode()))
+SportUtils.intToHex(Integer.parseInt(selectBean.getChannelCode()));
@@ -434,7 +365,7 @@
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
+ //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
doRegister(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
@@ -444,11 +375,8 @@
doRegister(5, null);
getVM().closeGrid(gridDo);
}
- if (handler.hasMessages(0)) {
- handler.removeMessages(0);
- }
}else {
- Toast.makeText(mContext, "鏈煡璇㈠埌", Toast.LENGTH_LONG).show();
+ ToastView.show(MApplication.mContext, "鏈煡璇㈠埌瑙勬牸淇℃伅");
}
} else {
//鍏抽棬澶辫触
@@ -484,7 +412,7 @@
getVM().closeGrid(gridDo);
}
}else {
- Toast.makeText(mContext, "鏈煡璇㈠埌", Toast.LENGTH_LONG).show();
+ ToastView.show(MApplication.mContext, "鏈煡璇㈠埌瑙勬牸淇℃伅");
}
} else {
//鍏抽棬澶辫触
@@ -494,4 +422,83 @@
}
}
}
+
+ @Subscribe(threadMode= ThreadMode.MAIN)
+ public void KeyResultEvent(KeyResultEvent e){
+ if(!isFinishing()){
+ if(selectBean!=null){
+ String key = SportUtils.intToHex(Integer.parseInt(selectBean.getBoardCode()))
+ +SportUtils.intToHex(Integer.parseInt(selectBean.getChannelCode()));
+ if(flag==0) {
+ //棰嗗彇
+ //鏌ヨ閽ュ寵鍙�
+ CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
+ if (gridDo != null) {
+ if (gridDo.getIsOpen() == 0) {
+ //鍏抽棬鎴愬姛
+ if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
+ if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
+ //棰嗗彇澶辫触
+ isOpened = false;
+ doRegister(6, null);
+ getVM().closeGrid(gridDo);
+ }else {
+ //閽ュ寵涓嶅尮閰�
+ //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
+ doRegister(10,null);
+ EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
+ }
+ } else {
+ //閽ュ寵鎷胯蛋浜�
+ isOpened = false;
+ doRegister(5, null);
+ getVM().closeGrid(gridDo);
+ }
+ }else {
+ //娌″叧闂�
+ if(TextUtils.isEmpty(gridDo.getCurKeyCode())){
+ //绌轰簡
+ doRegister(7,null);
+ }
+ }
+ }else {
+ ToastView.show(MApplication.mContext, "鏈煡璇㈠埌瑙勬牸淇℃伅");
+ }
+ }else {
+ //褰掕繕
+ CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
+ if (gridDo != null) {
+ if (gridDo.getIsOpen() == 0) {
+ //鍏抽棬鎴愬姛
+ if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
+ if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
+ //鐩稿悓褰掕繕鎴愬姛
+ isOpened = false;
+ doRegister(8, null);
+ getVM().closeGrid(gridDo);
+ }else {
+ //閽ュ寵涓嶅尮閰�
+ doRegister(10,null);
+ EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
+ }
+ } else {
+ //閽ュ寵鏈綊杩�
+ isOpened = false;
+ doRegister(9, null);
+ getVM().closeGrid(gridDo);
+ }
+ }else {
+ //娌″叧闂�
+ if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
+ //鏈夐挜鍖欎簡
+ doRegister(7,null);
+ }
+ }
+ } else {
+ ToastView.show(MApplication.mContext, "鏈煡璇㈠埌瑙勬牸淇℃伅");
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3