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

doum

昨天 22881a4d6409c7d17867e1d40bf81a13578208df

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

@@ -71,7 +71,6 @@

    public void devLogin(){
        //清除登录信息
        MApplication.saveConfigBean(new DevConfigBean());
        EventBus.getDefault().post(new HttpEvent("获取钥匙柜基本信息-请求"));
        getRetrofitService(Apis.class).getCabinetInfoForDriver(LMobileInfo.getDeviceUniqueId())
                .compose(RxUtils.schedulersTransformer())
@@ -89,6 +88,7 @@
                                toast(MApplication.mContext.getString(R.string.guide_toast_1));
                            }
                        }else {
                            MApplication.saveConfigBean(new DevConfigBean());
                            toast(response.getMessage());
                        }
                    }
@@ -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,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++){
@@ -197,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());
                                }
@@ -262,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()];
@@ -319,7 +324,7 @@
                .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                    @Override
                    public void onNext(@NonNull BaseResponse response) {
                        toast("关门接口调用成功");

                    }

                    @Override
@@ -340,7 +345,7 @@

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