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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListAdapter.java

@@ -11,6 +11,8 @@ import java.util.ArrayList;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
  * BookMarkListAdapter
@@ -22,27 +24,37 @@ import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class BookMarkListAdapter extends RecyclerView.Adapter<BookMarkViewHolder> {
+public class BookMarkListAdapter extends RecyclerView.Adapter<BookMarkListView> {
 
   private Context context;
   private ArrayList<BookmarkBean> bookmarkBeans;
+  private IEventListener listener;
 
-  public BookMarkListAdapter(Context context, ArrayList<BookmarkBean> bookmarkBeans) {
+  public BookMarkListAdapter(Context context, ArrayList<BookmarkBean> bookmarkBeans, IEventListener listener) {
     this.context = context;
     this.bookmarkBeans = bookmarkBeans;
+    this.listener = listener;
+
   }
 
   @NonNull
   @Override
-  public BookMarkViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+  public BookMarkListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.book_mark_list_view, parent, false);
-    return new BookMarkViewHolder(view);
+    return new BookMarkListViewHolder(view);
   }
 
   @Override
-  public void onBindViewHolder(@NonNull BookMarkViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull BookMarkListView holder, int position) {
     BookmarkBean bean = bookmarkBeans.get(position);
-    holder.bind(bean);
+    holder.bind(bean, new IEventListener() {
+      @Override
+      public void onEvent(Event event) {
+        if (null != listener) {
+          listener.onEvent(event);
+        }
+      }
+    });
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListFragment.java

@@ -6,7 +6,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,6 +16,8 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
 /**
@@ -77,7 +78,13 @@ public class BookMarkListFragment extends FragmentBase<BookMarkListPresenter> im
   @Override
   public void drawContents(ArrayList<BookmarkBean> bookmarkBeans) {
     
-    BookMarkListAdapter bookMarkListAdapter = new BookMarkListAdapter(getActivity(), bookmarkBeans);
+    BookMarkListAdapter bookMarkListAdapter = new BookMarkListAdapter(getActivity(), bookmarkBeans, new IEventListener() {
+      @Override
+      public void onEvent(Event event) {
+        presenter.onEvent(event);
+      }
+    });
+
     recyclerViewBookMarkList.setLayoutManager( new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
     recyclerViewBookMarkList.setAdapter(bookMarkListAdapter);
     recyclerViewBookMarkList.addItemDecoration(new RecyclerView.ItemDecoration() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListPresenter.java

@@ -1,5 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
+import kr.co.zumo.app.lifeplus.bean.ContentsBean;
+import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
@@ -26,7 +28,7 @@ public class BookMarkListPresenter extends Presenter<BookMarkListModel, IBookMar
     init();
   }
 
-  private void init(){
+  private void init() {
     model.loadBookMarkList();
   }
 
@@ -63,6 +65,19 @@ public class BookMarkListPresenter extends Presenter<BookMarkListModel, IBookMar
 
   @Override
   protected void onEventInternal(Event event) {
+    switch (event.getEventId()) {
+      case Event.CONTENTS:
+        ContentsBean bean = new ContentsBean();
+        bean.setItemNumber(model.getBookmarkBeans().get(event.getIndex()).getItemNumber());
+        bean.setImageUrl(model.getBookmarkBeans().get(event.getIndex()).getImageUrl());
+        DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
+        deliveryHelper.setPackaging(bean);
+
+        go(ScreenID.CONTENTS);
+        break;
+      default:
+        break;
+    }
 
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListView.java

@@ -0,0 +1,27 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+
+/**
+ * BookMarkListView
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-11-13]   [최초 작성]
+ * @since 2018-11-13
+ */
+public class BookMarkListView extends RecyclerView.ViewHolder {
+
+  public BookMarkListView(View itemView) {
+    super(itemView);
+  }
+
+  public void bind(BookmarkBean bean, IEventListener listener){
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkViewHolder.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.ImageView;
@@ -10,6 +9,8 @@ import com.bumptech.glide.Glide;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
  * BookMarkViewHolder
@@ -21,13 +22,13 @@ import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class BookMarkViewHolder extends RecyclerView.ViewHolder {
+public class BookMarkListViewHolder extends BookMarkListView {
   private ImageView imageViewBookMark;
   private TextView textViewBookMarkTitle;
   private CheckBox checkBoxLike;
   private CheckBox checkBoxBookMark;
 
-  public BookMarkViewHolder(View itemView) {
+  public BookMarkListViewHolder(View itemView) {
     super(itemView);
     imageViewBookMark = itemView.findViewById(R.id.image_view_book_mark);
     textViewBookMarkTitle = itemView.findViewById(R.id.text_view_book_mark_title);
@@ -35,13 +36,18 @@ public class BookMarkViewHolder extends RecyclerView.ViewHolder {
     checkBoxBookMark = itemView.findViewById(R.id.book_mark_check);
   }
 
-  public void bind(BookmarkBean bean) {
+
+  public void bind(BookmarkBean bean, IEventListener listener) {
 
     if (null != bean) {
       Glide.with(imageViewBookMark).load(bean.getImageUrl()).into(imageViewBookMark);
-      imageViewBookMark.setImageDrawable(itemView.getResources().getDrawable(R.drawable.mymain_bucket_banner_1));
       textViewBookMarkTitle.setText(bean.getTitle());
       checkBoxBookMark.setChecked(true);
     }
+
+    imageViewBookMark.setOnClickListener(view -> { if (null != listener) {
+        listener.onEvent(new Event.Builder(Event.CONTENTS).index(getAdapterPosition()).build());
+      }
+    });
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkAdapter.java

@@ -7,7 +7,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import java.util.ArrayList;
+
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -26,11 +29,15 @@ public class DefaultBookMarkAdapter extends RecyclerView.Adapter<DefaultBookMark
   private static final int TYPE_TITLE = 0;
   private static final int TYPE_TEXT = 1;
   private static final int TYPE_IMAGE = 2;
+  private static final int HEADER_COUNT = 2;
+
   private IEventListener listener;
+  private ArrayList<BookmarkBean> defaultBookmarkBeans;
   private Context context;
 
-  public DefaultBookMarkAdapter(Context context, IEventListener listener) {
+  public DefaultBookMarkAdapter(Context context, ArrayList<BookmarkBean> defaultBookmarkBeans, IEventListener listener) {
     this.listener = listener;
+    this.defaultBookmarkBeans = defaultBookmarkBeans;
     this.context = context;
   }
 
@@ -74,6 +81,7 @@ public class DefaultBookMarkAdapter extends RecyclerView.Adapter<DefaultBookMark
             listener.onEvent(event);
           }
         });
+        holder.setDefaultImageList(defaultBookmarkBeans.get(position - HEADER_COUNT));
         break;
       default:
         break;
@@ -83,7 +91,7 @@ public class DefaultBookMarkAdapter extends RecyclerView.Adapter<DefaultBookMark
 
   @Override
   public int getItemCount() {
-    return 6;
+    return defaultBookmarkBeans.size() + HEADER_COUNT;
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkFragment.java

@@ -10,9 +10,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import java.util.ArrayList;
+
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -28,7 +30,7 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresenter> {
+public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresenter> implements IDefaultBookMarkView {
 
   private RecyclerView recyclerViewDefaultBookMark;
 
@@ -40,22 +42,6 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     recyclerViewDefaultBookMark = findViewById(R.id.recycler_view_default_book_mark);
-    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter(getActivity(), new IEventListener() {
-      @Override
-      public void onEvent(Event event) {
-        presenter.onEvent(event);
-      }
-    });
-    recyclerViewDefaultBookMark.setLayoutManager( new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
-    recyclerViewDefaultBookMark.setAdapter(defaultBookMarkAdapter);
-    recyclerViewDefaultBookMark.addItemDecoration(new RecyclerView.ItemDecoration() {
-      // TODO: 클래스 분리 필요함
-      @Override
-      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-        super.getItemOffsets(outRect, view, parent, state);
-        outRect.bottom = ResourceUtil.dpToPx(35);
-      }
-    });
 
   }
 
@@ -71,7 +57,7 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
 
   @Override
   protected DefaultBookMarkPresenter definePresenter() {
-    return new DefaultBookMarkPresenter(getModel(BlankModel.class), this);
+    return new DefaultBookMarkPresenter(getModel(DefaultBookMarkModel.class), this);
   }
 
   @Override
@@ -88,4 +74,24 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
   protected boolean isSkipScreenWhenBack() {
     return false;
   }
+
+  @Override
+  public void drawContents(ArrayList<BookmarkBean> bookmarkBeans) {
+    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter(getActivity(), bookmarkBeans, new IEventListener() {
+      @Override
+      public void onEvent(Event event) {
+        presenter.onEvent(event);
+      }
+    });
+    recyclerViewDefaultBookMark.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+    recyclerViewDefaultBookMark.setAdapter(defaultBookMarkAdapter);
+    recyclerViewDefaultBookMark.addItemDecoration(new RecyclerView.ItemDecoration() {
+      // TODO: 클래스 분리 필요함
+      @Override
+      public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+        outRect.bottom = ResourceUtil.dpToPx(35);
+      }
+    });
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkImageViewHolder.java

@@ -4,7 +4,11 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
@@ -20,6 +24,7 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
 public class DefaultBookMarkImageViewHolder extends DefaultBookMarkView {
   private ImageView imageViewDefaultBookMark;
   private TextView textViewDefaultBookMark;
+  private static final int HEADER_COUNT = 2;
 
   public DefaultBookMarkImageViewHolder(View itemView) {
     super(itemView);
@@ -31,7 +36,21 @@ public class DefaultBookMarkImageViewHolder extends DefaultBookMarkView {
   @Override
   public void bind(IEventListener listener) {
     super.bind(listener);
-    imageViewDefaultBookMark.setImageDrawable(itemView.getResources().getDrawable(R.drawable.img_bookmark_default));
-    textViewDefaultBookMark.setText(R.string.book_mark_default_text);
+    imageViewDefaultBookMark.setOnClickListener(view -> {
+      if (null != listener) {
+        listener.onEvent(new Event.Builder(Event.CONTENTS).index(getAdapterPosition() - HEADER_COUNT).build());
+      }
+    });
+  }
+
+  @Override
+  public void setDefaultImageList(BookmarkBean bean) {
+    super.setDefaultImageList(bean);
+
+    if (null != bean) {
+      Glide.with(imageViewDefaultBookMark).load(bean.getImageUrl()).into(imageViewDefaultBookMark);
+      textViewDefaultBookMark.setText(bean.getTitle());
+    }
+
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkModel.java

@@ -0,0 +1,79 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
+
+import java.util.ArrayList;
+
+import io.reactivex.disposables.Disposable;
+import kr.co.zumo.app.lifeplus.bean.api.BestBookmarkRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkResultBean;
+import kr.co.zumo.app.lifeplus.model.Model;
+import kr.co.zumo.app.lifeplus.model.module.APIBookmarkBestModule;
+import kr.co.zumo.app.lifeplus.model.module.IAPIModuleListener;
+import kr.co.zumo.app.lifeplus.view.Event;
+
+/**
+ * DefaultBookMarkModel
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-11-13]   [최초 작성]
+ * @since 2018-11-13
+ */
+public class DefaultBookMarkModel extends Model {
+
+  private Disposable disposableDefaultBookmarkList;
+  private ArrayList<BookmarkBean> defaultBookmarkBeans;
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+
+  public void loadDefaultBookmarkList() {
+    disposableDefaultBookmarkList = new APIBookmarkBestModule().call(new BestBookmarkRequestBean(getUserId()), new IAPIModuleListener<BookmarkResultBean>() {
+      @Override
+      public void onApiSuccess(BookmarkResultBean resultBean) {
+        defaultBookmarkBeans = resultBean.getData();
+        onResult(new Event.Builder(Event.SUCCESS).build());
+      }
+
+
+      @Override
+      public void onApiReason(BookmarkResultBean resultBean) {
+
+      }
+
+      @Override
+      public void onApiError(String errorMessage) {
+
+      }
+    });
+  }
+
+  public ArrayList<BookmarkBean> getDefaultBookmarkList() {
+    return defaultBookmarkBeans;
+  }
+
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkPresenter.java

@@ -1,10 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
+import kr.co.zumo.app.lifeplus.bean.ContentsBean;
+import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
@@ -17,11 +18,18 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class DefaultBookMarkPresenter extends Presenter<BlankModel, IView> {
+public class DefaultBookMarkPresenter extends Presenter<DefaultBookMarkModel, IDefaultBookMarkView> {
 
+  private DoubleChecker doubleChecker;
 
-  public DefaultBookMarkPresenter(BlankModel model, IView view) {
+  public DefaultBookMarkPresenter(DefaultBookMarkModel model, IDefaultBookMarkView view) {
     super(model, view);
+    doubleChecker = new DoubleChecker(this::drawDefaultBookmarkList);
+    init();
+  }
+
+  private void init() {
+    model.loadDefaultBookmarkList();
   }
 
   @Override
@@ -73,6 +81,15 @@ public class DefaultBookMarkPresenter extends Presenter<BlankModel, IView> {
       case Event.FIFTH_CATEGORY:
         go(ScreenID.FIFTH_CATEGORY, ScreenID.DIRECTION_NEXT);
         break;
+      case Event.CONTENTS:
+        ContentsBean bean = new ContentsBean();
+        bean.setItemNumber(model.getDefaultBookmarkList().get(event.getIndex()).getItemNumber());
+        bean.setImageUrl(model.getDefaultBookmarkList().get(event.getIndex()).getImageUrl());
+        DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
+        deliveryHelper.setPackaging(bean);
+
+        go(ScreenID.CONTENTS);
+        break;
       default:
         break;
     }
@@ -80,16 +97,26 @@ public class DefaultBookMarkPresenter extends Presenter<BlankModel, IView> {
 
   @Override
   public void onResult(Event event) {
-
+    switch (event.getEventId()) {
+      case Event.SUCCESS:
+        doubleChecker.checkSecond();
+        break;
+      default:
+        break;
+    }
   }
 
   @Override
   public void onScreenReady() {
-
+    doubleChecker.checkFirst();
   }
 
   @Override
   public void onNavigationClickSearch(NavigationBar navigationBar) {
 
   }
+
+  private void drawDefaultBookmarkList() {
+    view.drawContents(model.getDefaultBookmarkList());
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkView.java

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
@@ -17,12 +18,11 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
  */
 public class DefaultBookMarkView extends RecyclerView.ViewHolder {
 
-
   public DefaultBookMarkView(View itemView) {
     super(itemView);
   }
 
-  public void bind(IEventListener listener){
+  public void bind(IEventListener listener){ }
 
-  }
+  public void setDefaultImageList(BookmarkBean bean){ }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/IDefaultBookMarkView.java

@@ -0,0 +1,22 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
+
+import java.util.ArrayList;
+
+import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.view.IView;
+
+/**
+ * IDefaultBookMarkView
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-11-13]   [최초 작성]
+ * @since 2018-11-13
+ */
+public interface IDefaultBookMarkView extends IView {
+
+  void drawContents(ArrayList<BookmarkBean> bookmarkBeans);
+
+}