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

rk

5 小时以前 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3

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

@@ -249,7 +249,6 @@

    public void getFaceDatas() {
        //showLoading(true);
        addInfo("查询人脸数据======》调用接口");
        getRetrofitService(Apis.class).allFaceList( LMobileInfo.getDeviceUniqueId())
                .compose(RxUtils.schedulersTransformer())
                .subscribe(new SimpleObserver<BaseResponse<CabinetFaceBean>>(rxJavaGcManager) {
@@ -344,13 +343,12 @@
        param.setCabinetId(MApplication.getConfigBean().getId());
        param.setMemberId(loginBean.getMemberId());
        param.setGridId(gridDo.getGridId());
        EventBus.getDefault().post(new HttpEvent("===>超时未关门-请求"));
        getRetrofitService(Apis.class).timeOutUnCloseAlarm(ParamsUtil.encodeRequestBody(param))
                .compose(RxUtils.schedulersTransformer())
                .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                    @Override
                    public void onNext(@NonNull BaseResponse response) {
                        toast("===>超时未关门-返回");
                        //toast("===>超时未关门-返回");
                    }

                    @Override
@@ -373,13 +371,13 @@
        param.setMemberId(loginBean.getMemberId());
        param.setGridId(gridDo.getGridId());
        param.setKeyStatus(!TextUtils.isEmpty(gridDo.getCurKeyCode())?1:2);
        EventBus.getDefault().post(new HttpEvent("===>首页关闭柜格-请求"));
        //EventBus.getDefault().post(new HttpEvent("===>首页关闭柜格-请求"));
        getRetrofitService(Apis.class).closeGrid(ParamsUtil.encodeRequestBody(param))
                .compose(RxUtils.schedulersTransformer())
                .subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
                    @Override
                    public void onNext(@NonNull BaseResponse response) {
                        EventBus.getDefault().post(new HttpEvent("===>首页关闭柜格-返回"));
                        //EventBus.getDefault().post(new HttpEvent("===>首页关闭柜格-返回"));
                    }

                    @Override