From 3c5e5ed692e2e5248080b064b7d14b8eb9988a8c Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期四, 11 十二月 2025 19:12:45 +0800
Subject: [PATCH] 指纹钥匙柜

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

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 39ca636..f4a59ac 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
@@ -153,12 +153,18 @@
         if(oldMap.size()>0) {
             CabinetGridDo[] dels = new CabinetGridDo[oldMap.size()];
             int i=0;
+            StringBuilder sb = new StringBuilder();
             for (String key : oldMap.keySet()) {
                 dels[i] = oldMap.get(key);
                 i++;
+                if(sb.length()>0){
+                    sb.append(",");
+                }
+                sb.append(oldMap.get(key).getKeyCode());
             }
             //鍒犻櫎澶氱殑
             DaoManager.getCabinetGridDao().delete(dels);
+            addInfo("鍒犻櫎瑙勬牸锛�"+dels.length);
         }
         if(addList.size()>0){
             DaoManager.getCabinetGridDao().insert(addList);
@@ -249,7 +255,6 @@
 
     public void getFaceDatas() {
         //showLoading(true);
-        addInfo("鏌ヨ浜鸿劯鏁版嵁======銆嬭皟鐢ㄦ帴鍙�");
         getRetrofitService(Apis.class).allFaceList( LMobileInfo.getDeviceUniqueId())
                 .compose(RxUtils.schedulersTransformer())
                 .subscribe(new SimpleObserver<BaseResponse<CabinetFaceBean>>(rxJavaGcManager) {
@@ -335,7 +340,7 @@
             }
             DaoManager.getCabinetGridDao().update(upList);
         }
-        addInfo("鏇存柊搴撴暟鎹�:淇敼" + updateList.size());
+        addInfo("鏇存柊搴撴暟鎹�:淇敼" + updateList.size()+",鎬诲叡:"+updateList.size());
     }
 
     public void timeOutUnCloseAlarm(CabinetGridDo gridDo){
@@ -344,13 +349,12 @@
         param.setCabinetId(MApplication.getConfigBean().getId());
         param.setMemberId(loginBean.getMemberId());
         param.setGridId(gridDo.getGridId());
-        EventBus.getDefault().post(new HttpEvent("===>瓒呮椂鏈叧闂�-璇锋眰"));
         getRetrofitService(Apis.class).timeOutUnCloseAlarm(ParamsUtil.encodeRequestBody(param))
                 .compose(RxUtils.schedulersTransformer())
                 .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                     @Override
                     public void onNext(@NonNull BaseResponse response) {
-                        toast("===>瓒呮椂鏈叧闂�-杩斿洖");
+                        //toast("===>瓒呮椂鏈叧闂�-杩斿洖");
                     }
 
                     @Override
@@ -373,13 +377,13 @@
         param.setMemberId(loginBean.getMemberId());
         param.setGridId(gridDo.getGridId());
         param.setKeyStatus(!TextUtils.isEmpty(gridDo.getCurKeyCode())?1:2);
-        EventBus.getDefault().post(new HttpEvent("===>棣栭〉鍏抽棴鏌滄牸-璇锋眰"));
+        //EventBus.getDefault().post(new HttpEvent("===>棣栭〉鍏抽棴鏌滄牸-璇锋眰"));
         getRetrofitService(Apis.class).closeGrid(ParamsUtil.encodeRequestBody(param))
                 .compose(RxUtils.schedulersTransformer())
                 .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                     @Override
                     public void onNext(@NonNull BaseResponse response) {
-                        EventBus.getDefault().post(new HttpEvent("===>棣栭〉鍏抽棴鏌滄牸-杩斿洖"));
+                        //EventBus.getDefault().post(new HttpEvent("===>棣栭〉鍏抽棴鏌滄牸-杩斿洖"));
                     }
 
                     @Override
@@ -399,8 +403,8 @@
     }
 
     public void addInfo(String info){
-        String s = infoObs.get();
+        /*String s = infoObs.get();
         s=info+"\n"+s;
-        infoObs.set(s);
+        infoObs.set(s);*/
     }
 }

--
Gitblit v1.9.3