Browse Source

[버킷][New] 버킷 수정 시 수정된 버킷 데이터 처리

hyodong.min 7 years ago
parent
commit
59d881f48c

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

@@ -419,7 +419,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    * @return
    */
   @Override
-  public Single<LifeplusAPIBean> updateMyBucket(BucketUpdateRequestBean bean) {
+  public Single<BucketRegisterResultBean> updateMyBucket(BucketUpdateRequestBean bean) {
     return api().updateMyBucket(bean);
   }
 

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

@@ -4,8 +4,8 @@
 package kr.co.zumo.app.lifeplus.model.module;
 
 import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.BucketRegisterResultBean;
 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;
 
 /**
@@ -19,9 +19,9 @@ import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
  * @history 민효동   [2018. 11. 13.]   [최초 작성]
  * @since 2018. 11. 13.
  */
-public class APIBucketUpdateModule extends LifeplusAPIModule<BucketUpdateRequestBean, LifeplusAPIBean> {
+public class APIBucketUpdateModule extends LifeplusAPIModule<BucketUpdateRequestBean, BucketRegisterResultBean> {
   @Override
-  protected Single<LifeplusAPIBean> getAPI(BucketUpdateRequestBean requestBean) {
+  protected Single<BucketRegisterResultBean> getAPI(BucketUpdateRequestBean requestBean) {
     return new LifeplusAPIRepository().updateMyBucket(requestBean);
   }
 }

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

@@ -194,7 +194,7 @@ public interface LifeplusAPI {
 
   // 버킷 리스트 수정
   @POST("mapi/my/updbucket.plus")
-  Single<LifeplusAPIBean> updateMyBucket(@Body BucketUpdateRequestBean bean);
+  Single<BucketRegisterResultBean> updateMyBucket(@Body BucketUpdateRequestBean bean);
 
   // 버킷 리스트 달성
   @POST("mapi/my/arhvbucket.plus")

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

@@ -199,7 +199,7 @@ public class LifeplusAPIRepository implements LifeplusAPI {
   }
 
   @Override
-  public Single<LifeplusAPIBean> updateMyBucket(BucketUpdateRequestBean bean) {
+  public Single<BucketRegisterResultBean> updateMyBucket(BucketUpdateRequestBean bean) {
     return new LifeplusAPIService().updateMyBucket(bean);
   }
 

+ 12 - 6
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListModel.java

@@ -186,18 +186,24 @@ public class AddMyBucketListModel extends Model {
     if (null == bucketBackgroundList.get(selectedIndex)) {
       return;
     }
+    LifeplusImageBean backgroundImageBean = bucketBackgroundList.get(selectedIndex);
+
     disposableRegister = new APIBucketUpdateModule().call(new BucketUpdateRequestBean(
         getUserName(),
         bucketMyBeanForEditing.getBucketNumber(),
         bucketText,
-        bucketBackgroundList.get(selectedIndex).getImageNumber()),
-      new APIModuleSimpleListener<LifeplusAPIBean>(waiterCaller) {
+        backgroundImageBean.getImageNumber()),
+      new APIModuleSimpleListener<BucketRegisterResultBean>(waiterCaller) {
         @Override
-        public void onApiSuccess(LifeplusAPIBean resultBean) {
+        public void onApiSuccess(BucketRegisterResultBean resultBean) {
+
+          BucketWithTagBean bean = resultBean.getData();
+
           bucketMyBeanForEditing.setTitle(bucketText);
-          bucketMyBeanForEditing.setImageUrl(bucketBackgroundList.get(selectedIndex).getImageUrl());
-          // todo tag 정보를 알 수 없어서 null 넣어둠.
-          bucketMyBeanForEditing.setTagList(null);
+          bucketMyBeanForEditing.setImageUrl(backgroundImageBean.getImageUrl());
+          bucketMyBeanForEditing.setTagList(bean.getTagList());
+          // 태그 추가
+          tags = bucketMyBeanForEditing.getTagList();
 
           BucketListModelHelper.getInstance().updateBucket();
           onResult(new Event.Builder(Event.SUCCESS).build());

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