|
|
@@ -7,11 +7,13 @@ import java.util.ArrayList;
|
|
|
|
|
|
import io.reactivex.Observable;
|
|
|
import io.reactivex.Single;
|
|
|
+import io.reactivex.functions.Consumer;
|
|
|
import kr.co.zumo.app.lifeplus.bean.api.ContentsFlagBean;
|
|
|
import kr.co.zumo.app.lifeplus.bean.api.ContentsFlagResultBean;
|
|
|
import kr.co.zumo.app.lifeplus.bean.api.LoginResultBean;
|
|
|
import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
|
|
|
import kr.co.zumo.app.lifeplus.helper.FirebaseHelper;
|
|
|
+import kr.co.zumo.app.lifeplus.model.SuperModel;
|
|
|
import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
|
|
|
import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
|
|
|
|
|
|
@@ -28,6 +30,16 @@ import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
|
|
|
public class APIMemberSelectModule extends LifeplusAPIModule<RequestBean, LoginResultBean> {
|
|
|
@Override
|
|
|
protected Single<LoginResultBean> getAPI(RequestBean requestBean) {
|
|
|
+ // login
|
|
|
+ Single<LoginResultBean> login = new LifeplusAPIRepository().selectMember(requestBean)
|
|
|
+ .doOnSuccess(new Consumer<LoginResultBean>() {
|
|
|
+ @Override
|
|
|
+ public void accept(LoginResultBean loginResultBean) throws Exception {
|
|
|
+ new LoginModuleParser(SuperModel.getInstance()).parse(loginResultBean);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ // contents flag
|
|
|
ContentsFlagHelper.getInstance().dispose();
|
|
|
Single<ContentsFlagResultBean> flags = ContentsFlagHelper.getInstance().load()
|
|
|
.onErrorReturn(throwable -> { // 에러 시 빈 데이터로 대체
|
|
|
@@ -38,9 +50,8 @@ public class APIMemberSelectModule extends LifeplusAPIModule<RequestBean, LoginR
|
|
|
tempBean.setData(data);
|
|
|
return new ContentsFlagResultBean();
|
|
|
});
|
|
|
- Single<LoginResultBean> login = new LifeplusAPIRepository().selectMember(requestBean);
|
|
|
|
|
|
- return Single.fromObservable(Observable.combineLatest(flags.toObservable(), login.toObservable(), (flagResultBean, loginResultBean) -> loginResultBean))
|
|
|
+ return Single.fromObservable(Observable.combineLatest(login.toObservable(), flags.toObservable(), (loginResultBean, flagResultBean) -> loginResultBean))
|
|
|
.doOnSuccess(loginResultBean -> {
|
|
|
// 로그인 이후 fcm 토근 저장
|
|
|
if (loginResultBean.isSuccess()) {
|