From 32f1fab3ce19db6539030c5e574212552a3f3abc Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:07:57 +0800
Subject: [PATCH] 钥匙柜

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 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 d1d11bd..40f82bc 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
@@ -71,14 +71,12 @@
 
     public void devLogin(){
         //娓呴櫎鐧诲綍淇℃伅
-        MApplication.saveConfigBean(new DevConfigBean());
         EventBus.getDefault().post(new HttpEvent("鑾峰彇閽ュ寵鏌滃熀鏈俊鎭�-璇锋眰"));
         getRetrofitService(Apis.class).getCabinetInfoForDriver(LMobileInfo.getDeviceUniqueId())
                 .compose(RxUtils.schedulersTransformer())
                 .subscribe(new SimpleObserver<BaseResponse<DevConfigBean>>(rxJavaGcManager) {
                     @Override
                     public void onNext(@NonNull BaseResponse<DevConfigBean> response) {
-                        EventBus.getDefault().post(new HttpEvent("鑾峰彇閽ュ寵鏌滃熀鏈俊鎭�-杩斿洖锛�"+ GsonTools.changeGsonToJson(response)));
                         if(200==response.getCode()){
                             if(response.getData()!=null){
                                 MApplication.saveConfigBean(response.getData());
@@ -90,6 +88,7 @@
                                 toast(MApplication.mContext.getString(R.string.guide_toast_1));
                             }
                         }else {
+                            MApplication.saveConfigBean(new DevConfigBean());
                             toast(response.getMessage());
                         }
                     }
@@ -129,6 +128,7 @@
                 gridDo.setKeyStatus(bean.getKeyStatus());
                 gridDo.setWorkingStatus(bean.getWorkingStatus());
                 updateList.add(gridDo);
+                oldMap.remove(key);
             }else {
                 //鏂板
                 CabinetGridDo gridDo = new CabinetGridDo();
@@ -144,9 +144,20 @@
                 addList.add(gridDo);
             }
         }
+        if(oldMap.size()>0) {
+            CabinetGridDo[] dels = new CabinetGridDo[oldMap.size()];
+            int i=0;
+            for (String key : oldMap.keySet()) {
+                dels[i] = oldMap.get(key);
+                i++;
+            }
+            //鍒犻櫎澶氱殑
+            DaoManager.getCabinetGridDao().delete(dels);
+        }
         if(addList.size()>0){
             DaoManager.getCabinetGridDao().insert(addList);
         }
+
         if(updateList.size()>0){
             CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
             for(int i=0;i<updateList.size();i++){
@@ -185,9 +196,6 @@
     }
 
     public void getFaceDatas() {
-        if (true) {
-            return;
-        }
         //showLoading(true);
         getRetrofitService(Apis.class).allFaceList( LMobileInfo.getDeviceUniqueId())
                 .compose(RxUtils.schedulersTransformer())
@@ -201,13 +209,13 @@
                                 List<FaceUserBean> datas = new ArrayList<>();
                                 if(faceBean!=null&&faceBean.getAutoFaceList()!=null){
                                     for(FaceUserBean bean:faceBean.getAutoFaceList()){
-                                        bean.setGroupId("1");
+                                        bean.setGroupId("0");
                                     }
                                     datas.addAll(faceBean.getAutoFaceList());
                                 }
                                 if(faceBean!=null&&faceBean.getDriverFaceList()!=null){
                                     for(FaceUserBean bean:faceBean.getDriverFaceList()){
-                                        bean.setGroupId("0");
+                                        bean.setGroupId("1");
                                     }
                                     datas.addAll(faceBean.getDriverFaceList());
                                 }
@@ -266,13 +274,6 @@
         return DaoManager.getCabinetGridDao().getOpenGrids();
     }
 
-    public void insertGrids(List<CabinetGridDo> addList){
-        if(addList.size()>0){
-            DaoManager.getCabinetGridDao().insert(addList);
-        }
-        addInfo("鏇存柊搴撴暟鎹�:鏂板" + addList.size());
-    }
-
     public void updateGrids(List<CabinetGridDo> updateList){
         if(updateList.size()>0){
             CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
@@ -323,7 +324,7 @@
                 .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                     @Override
                     public void onNext(@NonNull BaseResponse response) {
-                        toast("鍏抽棬鎺ュ彛璋冪敤鎴愬姛");
+
                     }
 
                     @Override
@@ -344,7 +345,7 @@
 
     public void addInfo(String info){
         String s = infoObs.get();
-        s+=info+"\n";
+        s=info+"\n"+s;
         infoObs.set(s);
     }
 }

--
Gitblit v1.9.3