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

doum

23 小时以前 22881a4d6409c7d17867e1d40bf81a13578208df

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

@@ -38,10 +38,8 @@
    }

    public void getDatas(){
        DevLoginParam param = new DevLoginParam();
        param.setCode(LMobileInfo.getDeviceUniqueId());
        showLoading(true);
        getRetrofitService(Apis.class).allFaceList(ParamsUtil.encodeRequestBody(param))
        getRetrofitService(Apis.class).allFaceList(LMobileInfo.getDeviceUniqueId())
                .compose(RxUtils.schedulersTransformer())
                .subscribe(new SimpleObserver<BaseResponse<CabinetFaceBean>>(rxJavaGcManager) {
                    @Override
@@ -53,13 +51,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());
                                }