Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/bean/MobileAuthBean.java

@@ -31,6 +31,8 @@ public class MobileAuthBean extends JsonBeanBase {
 
   public static final String NATIONALITY_DOMESTIC = "내국인";
   public static final String NATIONALITY_FOREIGNER = "외국인";
+  public static final String NATIONALITY_INDEX_DOMESTIC = "1";
+  public static final String NATIONALITY_INDEX_FOREIGNER = "2";
 
   @Retention(RetentionPolicy.SOURCE)
   @StringDef({NATIONALITY_DOMESTIC, NATIONALITY_FOREIGNER})
@@ -69,6 +71,21 @@ public class MobileAuthBean extends JsonBeanBase {
     return nationality;
   }
 
+  public String getNationalityIndex() {
+    String index;
+    switch (nationality) {
+      case NATIONALITY_FOREIGNER:
+        index = NATIONALITY_INDEX_FOREIGNER;
+        break;
+      case NATIONALITY_DOMESTIC:
+        /* falls through */
+      default:
+        index = NATIONALITY_INDEX_DOMESTIC;
+        break;
+    }
+    return index;
+  }
+
   public void setNationality(@Nationality String nationality) {
     this.nationality = nationality;
   }

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/MemberJoinRequestBean.java

@@ -25,12 +25,18 @@ public class MemberJoinRequestBean extends RequestBean {
   private String birthDate;
   @SerializedName("devPrno")
   private String deviceId;
+  @SerializedName("inFrnrDvcd")
+  private String nationality;
+  @SerializedName("corpDvsn")
+  private String mobileCompany;
 
-  public MemberJoinRequestBean(String name, String phoneNumber, String birthDate, String deviceId) {
+  public MemberJoinRequestBean(String name, String phoneNumber, String birthDate, String deviceId, String nationality, String mobileCompany) {
     this.name = name;
     this.phoneNumber = phoneNumber;
     this.birthDate = birthDate;
     this.deviceId = deviceId;
+    this.nationality = nationality;
+    this.mobileCompany = mobileCompany;
   }
 
   public String getName() {

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketAchieveModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketNumberRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketAchieveModule
+ * - 버킷 리스트 달성
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketAchieveModule extends APIModule<BucketNumberRequestBean, LifeplusAPIBean> {
+  @Override
+  protected Single<LifeplusAPIBean> getAPI(BucketNumberRequestBean requestBean) {
+    return new LifeplusAPIRepository().finishMyBucket(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketBackgroundListModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketBackgroundListModule
+ * - 버킷 리스트 배경 이미지 목록 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketBackgroundListModule extends APIModule<RequestBean, BucketBackgroundListResultBean> {
+  @Override
+  protected Single<BucketBackgroundListResultBean> getAPI(RequestBean requestBean) {
+    return new LifeplusAPIRepository().getMyBucketBackgroundList(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketBestModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBestListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketBestModule
+ * - 베스트 버킷 리스트 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketBestModule extends APIModule<RequestBean, BucketBestListResultBean> {
+  @Override
+  protected Single<BucketBestListResultBean> getAPI(RequestBean requestBean) {
+    return new LifeplusAPIRepository().getBestBucketList(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketDeleteModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketNumberRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketDeleteModule
+ * - 버킷 리스트 삭제
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketDeleteModule extends APIModule<BucketNumberRequestBean, LifeplusAPIBean> {
+  @Override
+  protected Single<LifeplusAPIBean> getAPI(BucketNumberRequestBean requestBean) {
+    return new LifeplusAPIRepository().deleteMyBucket(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketListModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketListRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketListResultBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketListModule
+ * - 버킷 리스트 목록 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketListModule extends APIModule<BucketListRequestBean, BucketListResultBean> {
+  @Override
+  protected Single<BucketListResultBean> getAPI(BucketListRequestBean requestBean) {
+    return new LifeplusAPIRepository().getBucketList(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketMyListModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketMyListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoRequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketMyListModule
+ * - 나의 버킷 리스트 목록 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketMyListModule extends APIModule<UserNoRequestBean, BucketMyListResultBean> {
+  @Override
+  protected Single<BucketMyListResultBean> getAPI(UserNoRequestBean requestBean) {
+    return new LifeplusAPIRepository().getMyBucketList(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketRegisterModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketRegisterRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketRegisterModule
+ * - 버킷 리스트 등록
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketRegisterModule extends APIModule<BucketRegisterRequestBean, LifeplusAPIBean> {
+  @Override
+  protected Single<LifeplusAPIBean> getAPI(BucketRegisterRequestBean requestBean) {
+    return new LifeplusAPIRepository().registerMyBucket(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketTagListModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketListTagResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.TitleRequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketMyListModule
+ * - 버킷 리스트 연관 태그 목록 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketTagListModule extends APIModule<TitleRequestBean, BucketListTagResultBean> {
+  @Override
+  protected Single<BucketListTagResultBean> getAPI(TitleRequestBean requestBean) {
+    return new LifeplusAPIRepository().getMyBucketTagList(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketTagRelatedListModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.TagRelatedContentsResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.TitleRequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketTagRelatedListModule
+ * - 버킷 리스트 연관 태그 목록 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketTagRelatedListModule extends APIModule<TitleRequestBean, TagRelatedContentsResultBean> {
+  @Override
+  protected Single<TagRelatedContentsResultBean> getAPI(TitleRequestBean requestBean) {
+    return new LifeplusAPIRepository().getTagRelatedContentsList(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketUpdateModule.java

@@ -0,0 +1,27 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketUpdateRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBucketUpdateModule
+ * - 버킷 리스트 수정
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBucketUpdateModule extends APIModule<BucketUpdateRequestBean, LifeplusAPIBean> {
+  @Override
+  protected Single<LifeplusAPIBean> getAPI(BucketUpdateRequestBean requestBean) {
+    return new LifeplusAPIRepository().updateMyBucket(requestBean);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ScreenIDMapper.java

@@ -70,6 +70,10 @@ public class ScreenIDMapper {
     return (int) value;
   }
 
+  /**
+   * 현재 맵핑 상태를 log 로 출력해준다.
+   * - 앱 작동과는 무관한 method
+   */
   public void print() {
     Log.w("APP# ScreenStarterIDMapper | put", "|" + " --------------------- Screen ID Map ----------------------------------");
     for (Map.Entry<Integer, Integer> entry : map.entrySet()) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreeModel.java

@@ -163,7 +163,13 @@ public class SignUpAgreeModel extends Model {
     else {
       // 필수 항목 체크 완료;
 
-      MemberJoinRequestBean bean = new MemberJoinRequestBean(mobileAuthBean.getName(), mobileAuthBean.getFullPhoneNumber(), mobileAuthBean.getBirthDate(), SuperModel.getInstance().getDeviceId());
+      MemberJoinRequestBean bean = new MemberJoinRequestBean(
+        mobileAuthBean.getName(),
+        mobileAuthBean.getFullPhoneNumber(),
+        mobileAuthBean.getBirthDate(),
+        SuperModel.getInstance().getDeviceId(),
+        mobileAuthBean.getNationalityIndex(),
+        mobileAuthBean.getMobileCompany());
 
       disposable.add(new APIMemberInsertModule().call(bean, new IAPIModuleListener<MemberJoinResultBean>() {
           @Override