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

doum

15 小时以前 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());
                        }
                    }
@@ -158,12 +158,6 @@
            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++){
@@ -215,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());
                                }
@@ -330,7 +324,7 @@
                .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                    @Override
                    public void onNext(@NonNull BaseResponse response) {
                        toast("关门接口调用成功");

                    }

                    @Override