Bladeren bron

[공통][New] 북마크 모듈 추가

hyodong.min 7 jaren geleden
bovenliggende
commit
969bfee013

+ 2 - 2
app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -244,8 +244,8 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    * @return
    */
   @Override
-  public Single<BookmarkResultBean> getLatsBookmarkList(UserNoRequestBean bean) {
-    return api().getLatsBookmarkList(bean);
+  public Single<BookmarkResultBean> getBestBookmarkList(UserNoRequestBean bean) {
+    return api().getBestBookmarkList(bean);
   }
 
   /**

+ 27 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBookmarkAtCategoryModule.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.BookmarkListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkMyCategoryRequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBookmarkAtCategoryModule
+ * - 북마크 목록 - 북마크 있는 경우, 카테고리 별 내 북마크 리스트
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBookmarkAtCategoryModule extends APIModule<BookmarkMyCategoryRequestBean, BookmarkListResultBean> {
+  @Override
+  protected Single<BookmarkListResultBean> getAPI(BookmarkMyCategoryRequestBean requestBean) {
+    return new LifeplusAPIRepository().getBookmarkListAtCategory(requestBean);
+  }
+}

+ 27 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBookmarkBestModule.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.BookmarkResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoRequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBookmarkBestModule
+ * - 최근 많이 한 북마크 목록 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBookmarkBestModule extends APIModule<UserNoRequestBean, BookmarkResultBean> {
+  @Override
+  protected Single<BookmarkResultBean> getAPI(UserNoRequestBean requestBean) {
+    return new LifeplusAPIRepository().getBestBookmarkList(requestBean);
+  }
+}

+ 27 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBookmarkLatestBestModule.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.BookmarkListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.CategoryRequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBookmarkLatestBestModule
+ * - 북마크 목록 - 북마크 없는 경우, 카테고리 별 최근 많이 한 북마크 목록
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBookmarkLatestBestModule extends APIModule<CategoryRequestBean, BookmarkListResultBean> {
+  @Override
+  protected Single<BookmarkListResultBean> getAPI(CategoryRequestBean requestBean) {
+    return new LifeplusAPIRepository().getLatestBestBookmarkListAtCategory(requestBean);
+  }
+}

+ 27 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBookmarkMyModule.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.BookmarkResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoRequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIBookmarkMyModule
+ * - 나의 북마크 목록 조회
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 13.]   [최초 작성]
+ * @since 2018. 11. 13.
+ */
+public class APIBookmarkMyModule extends APIModule<UserNoRequestBean, BookmarkResultBean> {
+  @Override
+  protected Single<BookmarkResultBean> getAPI(UserNoRequestBean requestBean) {
+    return new LifeplusAPIRepository().getMyBookmarkList(requestBean);
+  }
+}

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPI.java

@@ -105,7 +105,7 @@ public interface LifeplusAPI {
 
   // 최근 많이 한 북마크 목록 조회
   @POST("mapi/my/latsbookmarkctlg.plus")
-  Single<BookmarkResultBean> getLatsBookmarkList(@Body UserNoRequestBean bean);
+  Single<BookmarkResultBean> getBestBookmarkList(@Body UserNoRequestBean bean);
 
   // 북마크 목록 - 북마크 없는 경우, 카테고리 별 최근 많이 한 북마크 목록
   @POST("mapi/my/catebookmarkctlg.plus")

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIRepository.java

@@ -115,8 +115,8 @@ public class LifeplusAPIRepository implements LifeplusAPI {
   }
 
   @Override
-  public Single<BookmarkResultBean> getLatsBookmarkList(UserNoRequestBean bean) {
-    return new LifeplusAPIService().getLatsBookmarkList(bean);
+  public Single<BookmarkResultBean> getBestBookmarkList(UserNoRequestBean bean) {
+    return new LifeplusAPIService().getBestBookmarkList(bean);
   }
 
   @Override

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreeModel.java

@@ -96,6 +96,7 @@ public class SignUpAgreeModel extends Model {
    */
   public void saveUserId(String userId) {
     Log.i("APP# SignUpModel | saveUserId", "| userId: " + userId);
+    SuperModel.getInstance().clearMemberData();
     SuperModel.getInstance().setUserId(userId);
     ScreenIDMapper.getInstance().toMember().print();
   }

File diff suppressed because it is too large
+ 1 - 1
app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java