钥匙柜同步柜格实际钥匙数据

weimingfei

8 小时以前 afe46e7a96bc408cf1f6bb2d4a798eaf344047a1

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

@@ -136,12 +136,35 @@
                gridDo.setWorkingStatus(bean.getWorkingStatus());
                updateList.add(gridDo);
                oldMap.remove(key);
                if(isSubmit&&!isCheck(gridDo.getKeyCode(),gridDo.getCurKeyCode())){
                    SyncGridDataParam.GridDTO errDo = new SyncGridDataParam.GridDTO();
                    errDo.setActualLable(gridDo.getCurKeyCode());
                    errDo.setBoardCode(bean.getBoardCode());
                    errDo.setChannelCode(bean.getChannelCode());
                    errList.add(errDo);
                if(isSubmit){
                    boolean isSb = false;
                    //钥匙状态 1在位 2借出
                    if(1==gridDo.getKeyStatus()){
                        //判断是否一致
                        if(!isCheck(gridDo.getKeyCode(),gridDo.getCurKeyCode())){
                            //不一致
                            SyncGridDataParam.GridDTO errDo = new SyncGridDataParam.GridDTO();
                            errDo.setActualLable(gridDo.getCurKeyCode());
                            errDo.setBoardCode(bean.getBoardCode());
                            errDo.setChannelCode(bean.getChannelCode());
                            errList.add(errDo);
                            isSb = true;
                        }
                    }else if(2==gridDo.getKeyStatus()){
                        //借出
                        //当前不为空
                        if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
                            //不一致
                            SyncGridDataParam.GridDTO errDo = new SyncGridDataParam.GridDTO();
                            errDo.setActualLable(gridDo.getCurKeyCode());
                            errDo.setBoardCode(bean.getBoardCode());
                            errDo.setChannelCode(bean.getChannelCode());
                            errList.add(errDo);
                            isSb = true;
                        }
                    }
                    addInfo2(gridDo.getGridKey()+"，钥匙状态："+gridDo.getKeyStatus()+"，目标钥匙："+gridDo.getKeyCode()+"，当前钥匙："+
                            gridDo.getCurKeyCode()+"。是否上报："+(isSb?"上报":"不上报"));
                }
            }else {
                //新增
@@ -185,7 +208,9 @@
            }
            DaoManager.getCabinetGridDao().update(upList);
        }

        if(errList.size()>0){
            addInfo2("不一致数据："+errList.size());
            syncGridData(errList);
        }
    }
@@ -213,17 +238,18 @@
            sb.append(d.getBoardCode()+"_"+d.getChannelCode()+":"+d.getActualLable());
        }
        EventBus.getDefault().post(new HttpEvent("上报错误钥匙信息===》"+sb.toString()));
        addInfo2("不一致数据："+sb.toString());
        getRetrofitService(Apis.class).syncGridData(ParamsUtil.encodeRequestBody(param))
                .compose(RxUtils.schedulersTransformer())
                .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                    @Override
                    public void onNext(@NonNull BaseResponse response) {

                        addInfo2("同步柜格实际钥匙数据"+response.getMessage());
                    }

                    @Override
                    public void onError(@NonNull Throwable e) {

                        addInfo2("同步柜格实际钥匙数据错误；"+e.getMessage());
                    }

                    @Override
@@ -408,7 +434,11 @@
    public MutableLiveData<DevConfigBean> getConfidLD() {
        return confidLD;
    }

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