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

doum

14 小时以前 0cc81c61f36d0072b6252737e3d106ba0d4518a3

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

@@ -9,6 +9,7 @@
import com.doumee.keyCabinet.bean.CabinetFaceBean;
import com.doumee.keyCabinet.bean.FaceUserBean;
import com.doumee.keyCabinet.bean.KeyCabinetBean;
import com.doumee.keyCabinet.event.HttpEvent;
import com.doumee.keyCabinet.http.Apis;
import com.doumee.keyCabinet.http.param.AlcoholTestAlarmParam;
import com.doumee.keyCabinet.http.param.BaseResponse;
@@ -21,9 +22,14 @@
import com.doumee.lib_coremodel.base.BaseModel;
import com.doumee.lib_coremodel.base.DataViewModel;
import com.doumee.lib_coremodel.http.rxJava.SimpleObserver;
import com.doumee.lib_coremodel.http.utils.GsonTools;
import com.doumee.lib_coremodel.http.utils.RxUtils;
import com.doumee.lib_coremodel.util.StringUtil;

import org.greenrobot.eventbus.EventBus;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

public class FaceVM extends DataViewModel {
@@ -43,26 +49,28 @@
     * @param type //0：管理员，1：司机
     */
    public void getMemberIdByCode(String code,String type){
        showLoading(true);
        //showLoading(true);
        getRetrofitService(Apis.class).getMemberIdByCode(code)
                .compose(RxUtils.schedulersTransformer())
                .subscribe(new SimpleObserver<BaseResponse<Integer>>(rxJavaGcManager) {
                    @Override
                    public void onNext(@NonNull BaseResponse<Integer> response) {
                        EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+
                                "获取IC卡用户主键 - 司机:"+code+", 返回："+ GsonTools.changeGsonToJson(response)));
                        if(200==response.getCode()){
                            //查询数据
                            if(response.getData()!=null){
                                if("0".equals(type)){
                                    MApplication.getLoginBean().setAutoMemberId(response.getData());
                                    //doAction();
                                    doAction(6);
                                }else {
                                    MApplication.getLoginBean().setMemberId(response.getData());
                                    MApplication.getLoginBean().setAuthType(1);
                                    //doAction();
                                    doAction(7);
                                }
                            }
                        }else {
                            toast(response.getMessage());
                            //toast(response.getMessage());
                        }
                    }

@@ -73,7 +81,7 @@

                    @Override
                    public void onComplete() {
                        hideLoading();
                        //hideLoading();
                    }
                });
    }
@@ -85,6 +93,7 @@
    public void alcoholTestAlarm(String data){
        AlcoholTestAlarmParam param = new AlcoholTestAlarmParam();
        param.setMemberId(MApplication.getLoginBean().getMemberId());
        param.setAlcoholNum(data);
        showLoading(true);
        getRetrofitService(Apis.class).alcoholTestAlarm(ParamsUtil.encodeRequestBody(param))
                .compose(RxUtils.schedulersTransformer())