Browse Source

[버킷][New] 버킷 추가 시 작은 이미지 사용

hyodong.min 7 năm trước cách đây
mục cha
commit
0c6bdbfdb0

+ 40 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/BucketBackgroundImageBean.java

@@ -0,0 +1,40 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.bean.api;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * BucketBackgroundImageBean
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2019. 1. 3.]   [최초 작성]
+ * @since 2019. 1. 3.
+ */
+public class BucketBackgroundImageBean extends LifeplusImageBean {
+
+  @SerializedName("tnImagFileUrl")
+  private String thumbnailUrl;
+
+  private transient boolean isSelected;
+
+  public boolean isSelected() {
+    return isSelected;
+  }
+
+  public void setSelected(boolean selected) {
+    isSelected = selected;
+  }
+
+  public String getThumbnailUrl() {
+    return thumbnailUrl;
+  }
+
+  public void setThumbnailUrl(String thumbnailUrl) {
+    this.thumbnailUrl = thumbnailUrl;
+  }
+}

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/BucketBackgroundListResultBean.java

@@ -13,5 +13,5 @@ package kr.co.zumo.app.lifeplus.bean.api;
  * @history 민효동   [2018. 11. 8.]   [최초 작성]
  * @since 2018. 11. 8.
  */
-public class BucketBackgroundListResultBean extends LifeplusAPIResultListBean<LifeplusImageBean> {
+public class BucketBackgroundListResultBean extends LifeplusAPIResultListBean<BucketBackgroundImageBean> {
 }

+ 1 - 10
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/LifeplusImageBean.java

@@ -35,13 +35,12 @@ public class LifeplusImageBean extends JsonBeanBase {
   private String imageNumber;
   @SerializedName("imagType")
   private String imageType;
+  //  @SerializedName(value = "imagFileUrl", alternate = {"bgImagFileUrl"})
   @SerializedName("imagFileUrl")
   private String imageUrl;
 
   private String copyRight;
 
-  private transient boolean isSelected;
-
   public String getImageNumber() {
     return imageNumber;
   }
@@ -66,14 +65,6 @@ public class LifeplusImageBean extends JsonBeanBase {
     this.imageUrl = imageUrl;
   }
 
-  public boolean isSelected() {
-    return isSelected;
-  }
-
-  public void setSelected(boolean selected) {
-    isSelected = selected;
-  }
-
   public String getCopyRight() {
     return copyRight;
   }

+ 5 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListAdapter.java

@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusImageBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.view.IClickListener;
 
 /**
@@ -27,13 +27,13 @@ import kr.co.zumo.app.lifeplus.view.IClickListener;
 public class AddMyBucketListAdapter extends RecyclerView.Adapter<AddMyBucketListViewHolder> {
 
   private Context context;
-  private List<LifeplusImageBean> data;
+  private List<BucketBackgroundImageBean> data;
   private List<AddMyBucketListViewHolder> holders;
   private IClickListener listener;
 
   private int selectedIndex;
 
-  public AddMyBucketListAdapter(Context context, List<LifeplusImageBean> data, int selectedIndex, IClickListener listener) {
+  public AddMyBucketListAdapter(Context context, List<BucketBackgroundImageBean> data, int selectedIndex, IClickListener listener) {
     this.context = context;
     this.data = data;
     this.listener = listener;
@@ -51,7 +51,7 @@ public class AddMyBucketListAdapter extends RecyclerView.Adapter<AddMyBucketList
 
   @Override
   public void onBindViewHolder(@NonNull AddMyBucketListViewHolder holder, int position) {
-    LifeplusImageBean bean = data.get(position);
+    BucketBackgroundImageBean bean = data.get(position);
     holder.bind(bean, index -> {
       setFocus(index);
       this.listener.onClick(index);
@@ -65,7 +65,7 @@ public class AddMyBucketListAdapter extends RecyclerView.Adapter<AddMyBucketList
 
   private void setFocus(int index) {
     int len = data.size();
-    LifeplusImageBean bean;
+    BucketBackgroundImageBean bean;
     for (int i = 0; i < len; ++i) {
       bean = data.get(i);
       bean.setSelected(i == index);

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListFragment.java

@@ -22,6 +22,7 @@ import com.bumptech.glide.Glide;
 import java.util.List;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusImageBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.util.SoftKeyboardUtil;
@@ -173,7 +174,7 @@ public class AddMyBucketListFragment extends FragmentBase<AddMyBucketListPresent
   }
 
   @Override
-  public void init(List<LifeplusImageBean> myBucketListData) {
+  public void init(List<BucketBackgroundImageBean> myBucketListData) {
     int selectedIndex = presenter.getSelectedIndex();
     addMyBucketListAdapter = new AddMyBucketListAdapter(getActivity(), myBucketListData, selectedIndex, index -> {
       presenter.onEvent(new Event.Builder(Event.CLICK).integer(index).build());

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketCompleteRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketNumberRequestBean;
@@ -42,7 +43,7 @@ public class AddMyBucketListModel extends Model {
   private Disposable disposableAchieve;
   private Disposable disposableDelete;
 
-  private List<LifeplusImageBean> bucketBackgroundList;
+  private List<BucketBackgroundImageBean> bucketBackgroundList;
   private int selectedIndex = 0;  // 선택 인덱스
 
   private String bucketText = "";
@@ -93,7 +94,7 @@ public class AddMyBucketListModel extends Model {
       // 리스트에서 동일한 url 의 이미지 검색;
       String imageUrl = bucketMyBeanForEditing.getImageUrl();
       int index = 0;
-      List<LifeplusImageBean> list = getBucketBackgroundList();
+      List<BucketBackgroundImageBean> list = getBucketBackgroundList();
       if (null != list && list.size() > 0) {
         int len = list.size();
         for (int i = 0; i < len; ++i) {
@@ -291,7 +292,7 @@ public class AddMyBucketListModel extends Model {
    *
    * @return
    */
-  public List<LifeplusImageBean> getBucketBackgroundList() {
+  public List<BucketBackgroundImageBean> getBucketBackgroundList() {
     return bucketBackgroundList;
   }
 

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

@@ -7,8 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketWithTagBean;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusImageBean;
 import kr.co.zumo.app.lifeplus.bean.api.TagBean;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
@@ -123,7 +123,7 @@ public class AddMyBucketListPresenter extends Presenter<AddMyBucketListModel, IA
   }
 
   private void render() {
-    List<LifeplusImageBean> list = model.getBucketBackgroundList();
+    List<BucketBackgroundImageBean> list = model.getBucketBackgroundList();
     if (null != list) {
       view.init(model.getBucketBackgroundList());
     }
@@ -149,9 +149,9 @@ public class AddMyBucketListPresenter extends Presenter<AddMyBucketListModel, IA
   }
 
   protected void changeBackground(int index) {
-    List<LifeplusImageBean> list = model.getBucketBackgroundList();
+    List<BucketBackgroundImageBean> list = model.getBucketBackgroundList();
     if (null != list) {
-      LifeplusImageBean bean = list.get(index);
+      BucketBackgroundImageBean bean = list.get(index);
 
       if (null != bean) {
         view.changeBackground(bean.getImageUrl());
@@ -160,14 +160,14 @@ public class AddMyBucketListPresenter extends Presenter<AddMyBucketListModel, IA
   }
 
   protected void changeDescription(int index) {
-    List<LifeplusImageBean> list = model.getBucketBackgroundList();
-    if (null != list) {
-      LifeplusImageBean bean = list.get(index);
-
-      if (null != bean) {
-        view.changeDescription(bean.getImageType());
-      }
-    }
+//    List<BucketBackgroundImageBean> list = model.getBucketBackgroundList();
+//    if (null != list) {
+//      BucketBackgroundImageBean bean = list.get(index);
+//
+//      if (null != bean) {
+//        view.changeDescription(bean.getImageType());
+//      }
+//    }
   }
 
   /**

+ 5 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListViewHolder.java

@@ -8,7 +8,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusImageBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.view.IClickListener;
 
 /**
@@ -36,12 +36,12 @@ public class AddMyBucketListViewHolder extends RecyclerView.ViewHolder {
    * @param bean
    * @param listener
    */
-  public void bind(LifeplusImageBean bean, IClickListener listener) {
+  public void bind(BucketBackgroundImageBean bean, IClickListener listener) {
     if (null != bean) {
       imageViewSelectImage = itemView.findViewById(R.id.image_view_select_image);
       imageVieWCircleBorder = itemView.findViewById(R.id.image_view_select_border);
       Glide.with(imageViewSelectImage)
-        .asBitmap().load(bean.getImageUrl()).apply(RequestOptions.circleCropTransform()).into(imageViewSelectImage);
+        .asBitmap().load(bean.getThumbnailUrl()).apply(RequestOptions.circleCropTransform()).into(imageViewSelectImage);
       imageViewSelectImage.setOnClickListener(view -> {
         if (null != listener) {
           listener.onClick(getIndex());
@@ -55,7 +55,7 @@ public class AddMyBucketListViewHolder extends RecyclerView.ViewHolder {
    *
    * @param bean
    */
-  public void attach(LifeplusImageBean bean) {
+  public void attach(BucketBackgroundImageBean bean) {
     select(bean.isSelected());
   }
 
@@ -64,7 +64,7 @@ public class AddMyBucketListViewHolder extends RecyclerView.ViewHolder {
    *
    * @param bean
    */
-  public void detach(LifeplusImageBean bean) {
+  public void detach(BucketBackgroundImageBean bean) {
 
   }
 

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListDefaultDetailFragment.java

@@ -14,7 +14,7 @@ import com.bumptech.glide.Glide;
 import java.util.List;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusImageBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
@@ -112,7 +112,7 @@ public class BucketListDefaultDetailFragment extends FragmentBase<BucketListDefa
   }
 
   @Override
-  public void init(List<LifeplusImageBean> myBucketListData) {
+  public void init(List<BucketBackgroundImageBean> myBucketListData) {
     // nothing
   }
 

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/IAddMyBucketListView.java

@@ -2,7 +2,7 @@ package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
 
 import java.util.List;
 
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusImageBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.view.IView;
 
 /**
@@ -52,7 +52,7 @@ public interface IAddMyBucketListView extends IView {
    *
    * @param myBucketListData
    */
-  void init(List<LifeplusImageBean> myBucketListData);
+  void init(List<BucketBackgroundImageBean> myBucketListData);
 
   /**
    * 버킷 리스트 내용