Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

21 小时以前 0cc81c61f36d0072b6252737e3d106ba0d4518a3

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java

@@ -128,6 +128,7 @@
                gridDo.setKeyStatus(bean.getKeyStatus());
                gridDo.setWorkingStatus(bean.getWorkingStatus());
                updateList.add(gridDo);
                oldMap.remove(key);
            }else {
                //新增
                CabinetGridDo gridDo = new CabinetGridDo();
@@ -143,9 +144,26 @@
                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);
        }

        //todo 去掉
        CabinetGridDo gridDo = oldMap.get("0101");
        if(gridDo!=null){
            EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>更新数据当前钥匙1："+gridDo.getCurKeyCode()));
        }

        if(updateList.size()>0){
            CabinetGridDo[] upList = new CabinetGridDo[updateList.size()];
            for(int i=0;i<updateList.size();i++){
@@ -262,13 +280,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()];
@@ -340,7 +351,7 @@

    public void addInfo(String info){
        String s = infoObs.get();
        s+=info+"\n";
        s=info+"\n"+s;
        infoObs.set(s);
    }
}