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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/AddingRect.java

@@ -64,10 +64,10 @@ public class AddingRect {
           /**
            * type == ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE 이면 point 로 그려줌
            */
-          if (ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(type)) {
+          if (ContentsItemBean.TYPE_ATTRIBUTE_CONTENTS.equals(type)) {
             imageView = getRect(rectBean, parent, width, height, listener);
           }
-          else if (ContentsItemBean.TYPE_ATTRIBUTE_CONTENTS.equals(type)) {
+          else if (ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(type)) {
             imageView = getPoint(rectBean, parent, width, height, listener);
           }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsCardHolder.java

@@ -23,6 +23,7 @@ import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailImageBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsItemBean;
 import kr.co.zumo.app.lifeplus.bean.api.ItemRectBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Visibler;
 
 /**
@@ -120,12 +121,9 @@ public class ContentsCardHolder extends ContentsHolder<ContentsItemBean> {
         ConstraintLayout parent = (ConstraintLayout) imageViewCardListicleCover.getParent();
         itemView.post(() -> {
           AddingRect.remove(parent, rectangles);
-          if (ContentsItemBean.TYPE_ATTRIBUTE_CONTENTS.equals(bean.getListAttributeType())) {
-            rectangles = AddingRect.addRect(ContentsItemBean.TYPE_ATTRIBUTE_CONTENTS, rectList, parent, itemView.getWidth(), itemView.getHeight(), listener);
-
-          }
-          else if (ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType())) {
-            rectangles = AddingRect.addRect(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE, rectList, parent, itemView.getWidth(), itemView.getHeight(), listener);
+          String type = bean.getListAttributeType();
+          if (StringUtil.isFull(type)) {
+            rectangles = AddingRect.addRect(type, rectList, parent, itemView.getWidth(), itemView.getHeight(), listener);
           }
         });
       }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/view/ListicleImageViewHolder.java

@@ -13,9 +13,9 @@ import java.util.List;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailImageBean;
-import kr.co.zumo.app.lifeplus.bean.api.ContentsItemBean;
 import kr.co.zumo.app.lifeplus.bean.api.ItemRectBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.contents.AddingRect;
@@ -76,11 +76,9 @@ public class ListicleImageViewHolder extends RecyclerView.ViewHolder {
 
     itemView.post(() -> {
       AddingRect.remove(parent, rectangles);
-      if (ContentsItemBean.TYPE_ATTRIBUTE_CONTENTS.equals(bean.getListAttributeType())) {
-        rectangles = AddingRect.addRect(ContentsItemBean.TYPE_ATTRIBUTE_CONTENTS, rectList, parent, itemView.getWidth(), itemView.getHeight(), listener);
-      }
-      else if (ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType())) {
-        rectangles = AddingRect.addRect(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE, rectList, parent, itemView.getWidth(), itemView.getHeight(), listener);
+      String type = bean.getListAttributeType();
+      if (StringUtil.isFull(type)) {
+        rectangles = AddingRect.addRect(type, rectList, parent, itemView.getWidth(), itemView.getHeight(), listener);
       }
     });
   }