From 8ff90d87687b6d38158809aae776b6c709d7b60a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期四, 04 十二月 2025 12:01:41 +0800
Subject: [PATCH] 指纹钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
index 3ffcd14..4e6109c 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
@@ -37,12 +37,13 @@
import com.doumee.keyCabinet.event.OpenGridOneResultEvent;
import com.doumee.keyCabinet.event.TimeClockEvent;
import com.doumee.keyCabinet.ui.keyCabinet.adapter.ManageCabinetRcvAdapter;
+import com.doumee.keyCabinet.utils.MCUtils;
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.example.datalibrary.db.DBManager;
-import com.innohi.YNHAPI;
+import com.mc.enjoysdk.McSystemUi;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -110,8 +111,8 @@
@Override
public boolean onLongClick(View v) {
//鍙互涓嬫媺
- YNHAPI mAPI = YNHAPI.getInstance();
- mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.VISIBLE);
+ McSystemUi mcSystemUi = McSystemUi.getInstance(ManageCabinetActivity.this);
+ MCUtils.show(mcSystemUi);
return true;
}
});
@@ -183,11 +184,6 @@
CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
for(int i=0;i<updateList.size();i++){
upList[i] = updateList.get(i);
- }
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null){
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵2锛�"+gridDo.getCurKeyCode()));
}
DaoManager.getCabinetGridDao().update(upList);
@@ -359,7 +355,7 @@
}
if(isShowOpenTip){
if(openTipDownCount==0){
- doRegister(9,null);
+ getVM().doAction(9);
}else {
openTipDownCount--;
getDB().tvClKmClose.setText(openTipDownCount+"s 鑷姩鍏抽棴");
@@ -678,8 +674,25 @@
if(!isFail){
if(copyMap.containsKey(gridDo.getGridKey())){
//鍏抽棬鎴愬姛
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"闂ㄥ叧闂垚鍔�***************************>鐩爣锛�"+gridDo.getKeyCode()+",褰撳墠锛�"+gridDo.getCurKeyCode()));
- getVM().closeGrid(gridDo);
+ boolean isSend = false;
+ String bh = gridDo.getGridKey().substring(0,2);
+ if("1".equals(e.getType())){
+ //1鍙锋澘
+ if("01".equals(bh)){
+ isSend = true;
+ }
+ }else if("2".equals(e.getType())){
+ //2鍙锋澘
+ if("02".equals(bh)){
+ isSend = true;
+ }
+ }else {
+ isSend = true;
+ }
+ if(isSend) {
+ EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date()) + "闂ㄥ叧闂垚鍔�***************************>鐩爣锛�" + gridDo.getKeyCode() + ",褰撳墠锛�" + gridDo.getCurKeyCode()));
+ getVM().closeGrid(gridDo);
+ }
}
}
}
--
Gitblit v1.9.3