[공통][Bug] ContentsBean refactoring

app/src/main/java/kr/co/zumo/app/lifeplus/bean/ContentsBean.java

@@ -3,6 +3,8 @@
  */
 package kr.co.zumo.app.lifeplus.bean;
 
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
+
 /**
  * ContentsBean
  * <pre>
@@ -15,76 +17,89 @@ package kr.co.zumo.app.lifeplus.bean;
  */
 public class ContentsBean extends JsonBeanBase {
 
-  private String categoryNumber;
-  private String itemNumber;
-  private String itemImageNumber;
-  private String title;
-  private String subTitle;
-  private String imageName;
-  private String imageUrl;
-  private String contentUrl;
+  //final private String itemImageNumber;
+  final private String title;
+  final private String categoryNumber;
+  final private String itemNumber;
+  final private String subTitle;
+  final private String imageName;
+  final private String imageUrl;
+  final private String contentUrl;
+
+  private ContentsBean(Builder builder) {
+    title = builder.title;
+    categoryNumber = builder.categoryNumber;
+    itemNumber = builder.itemNumber;
+    subTitle = builder.subTitle;
+    imageName = builder.imageName;
+    imageUrl = builder.imageUrl;
+    contentUrl = builder.contentUrl;
+  }
 
   public String getCategoryNumber() {
     return categoryNumber;
   }
 
-  public void setCategoryNumber(String categoryNumber) {
-    this.categoryNumber = categoryNumber;
-  }
 
   public String getItemNumber() {
     return itemNumber;
   }
 
-  public void setItemNumber(String itemNumber) {
-    this.itemNumber = itemNumber;
-  }
 
-  public String getItemImageNumber() {
-    return itemImageNumber;
-  }
-
-  public void setItemImageNumber(String itemImageNumber) {
-    this.itemImageNumber = itemImageNumber;
-  }
+//  public String getItemImageNumber() {
+//    return itemImageNumber;
+//  }
 
   public String getTitle() {
     return title;
   }
 
-  public void setTitle(String title) {
-    this.title = title;
-  }
 
   public String getSubTitle() {
     return subTitle;
   }
 
-  public void setSubTitle(String subTitle) {
-    this.subTitle = subTitle;
-  }
 
   public String getImageName() {
     return imageName;
   }
 
-  public void setImageName(String imageName) {
-    this.imageName = imageName;
-  }
 
   public String getImageUrl() {
     return imageUrl;
   }
 
-  public void setImageUrl(String imageUrl) {
-    this.imageUrl = imageUrl;
-  }
 
   public String getContentUrl() {
     return contentUrl;
   }
 
-  public void setContentUrl(String contentUrl) {
-    this.contentUrl = contentUrl;
+  /**
+   * Builder
+   */
+  public static class Builder {
+    private String categoryNumber;
+    private String itemNumber;
+    //    private String itemImageNumber;
+    private String title;
+    private String subTitle;
+    private String imageName;
+    private String imageUrl;
+    private String contentUrl;
+
+    public Builder(LifeplusContentsBean lifeplusContentsBean, String categoryNumber) {
+      this.categoryNumber = categoryNumber;
+      this.itemNumber = lifeplusContentsBean.getItemNumber();
+//      this.itemImageNumber = lifeplusContentsBean.
+      this.title = lifeplusContentsBean.getTitle();
+      this.subTitle = lifeplusContentsBean.getSubTitle();
+      this.imageName = lifeplusContentsBean.getImageName();
+      this.imageUrl = lifeplusContentsBean.getImageUrl();
+      this.contentUrl = lifeplusContentsBean.getContentsUrl();
+    }
+
+    public ContentsBean build() {
+      return new ContentsBean(this);
+    }
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/network/NetworkStatus.java

@@ -5,6 +5,7 @@ package kr.co.zumo.app.lifeplus.network;
 
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.util.Log;
 
 /**
  * NetworkStatus
@@ -40,8 +41,10 @@ public class NetworkStatus {
 
     try {
       isConnected = networkInfo.isConnected();
+      Log.i("APP# NetworkStatus | isConnected", "|" + isConnected);
     } catch (Throwable e) {
       isConnected = false;
+      Log.i("APP# NetworkStatus | isConnected", "| Throwable " + isConnected);
     }
 
     return isConnected;

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/CategoryMainPresenter.java

@@ -120,10 +120,7 @@ public abstract class CategoryMainPresenter<M extends CategoryMainModel, V exten
   }
 
   private void setContentsHelper(LifeplusContentsBean bean) {
-    ContentsBean contentsBean = new ContentsBean();
-    contentsBean.setCategoryNumber(getCategoryNumber());
-    contentsBean.setImageUrl(bean.getImageUrl());
-    contentsBean.setContentUrl(bean.getContentsUrl());
+    ContentsBean contentsBean = new ContentsBean.Builder(bean, getCategoryNumber()).build();
 
     DeliveryHelper helper = getHelper(DeliveryHelper.class);
     helper.setPackaging(contentsBean);

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

@@ -213,7 +213,7 @@ public class ContentsPresenter extends Presenter<ContentsModel, IContentsView> {
 
   private void sendKakaoLink() {
     share = new ShareKakaoTalk(view.getActivity());
-    share.shareContents(model.getContentsBean().getContentUrl(), new IShareListener() {
+    share.shareContents(model.getContentsBean().toJson(), new IShareListener() {
       @Override
       public void onSuccess(String result) {
         showToast("", ResourceUtil.getString(R.string.share_completed_message), 1);

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

@@ -161,12 +161,8 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
   }
 
   private void setContentsHelper(String categoryNumber, int categoryIndex, int contentsIndex) {
-    ContentsBean contentsBean = new ContentsBean();
     MainContentsCategoryBean bean = model.getContentsBeans().get(categoryIndex).getContentsList().get(contentsIndex);
-    contentsBean.setCategoryNumber(categoryNumber);
-    contentsBean.setTitle(bean.getTitle());
-    contentsBean.setImageUrl(bean.getImageUrl());
-    contentsBean.setContentUrl(bean.getContentsUrl());
+    ContentsBean contentsBean = new ContentsBean.Builder(bean, categoryNumber).build();
 
     DeliveryHelper helper = getHelper(DeliveryHelper.class);
     helper.setPackaging(contentsBean);

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

@@ -68,12 +68,8 @@ public class BookMarkListPresenter extends Presenter<BookMarkListModel, IBookMar
   protected void onEventInternal(Event event) {
     switch (event.getEventId()) {
       case Event.CONTENTS:
-        ContentsBean contentsBean = new ContentsBean();
         LifeplusContentsBean bean = model.getBookmarkBeans().get(event.getIndex());
-        contentsBean.setItemNumber(bean.getItemNumber());
-        contentsBean.setTitle(bean.getTitle());
-        contentsBean.setImageUrl(bean.getImageUrl());
-        contentsBean.setContentUrl(bean.getContentsUrl());
+        ContentsBean contentsBean = new ContentsBean.Builder(bean, "0").build();
 
         DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
         deliveryHelper.setPackaging(contentsBean);

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

@@ -83,12 +83,8 @@ public class DefaultBookMarkPresenter extends Presenter<DefaultBookMarkModel, ID
         go(ScreenID.FIFTH_CATEGORY, ScreenID.DIRECTION_NEXT);
         break;
       case Event.CONTENTS:
-        ContentsBean contentsBean = new ContentsBean();
         LifeplusContentsBean bean = model.getDefaultBookmarkList().get(event.getIndex());
-        contentsBean.setTitle(bean.getTitle());
-        contentsBean.setImageUrl(bean.getImageUrl());
-        contentsBean.setContentUrl(bean.getContentsUrl());
-        contentsBean.setItemNumber(bean.getItemNumber());
+        ContentsBean contentsBean = new ContentsBean.Builder(bean, "0").build();
 
         DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
         deliveryHelper.setPackaging(contentsBean);

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

@@ -145,22 +145,16 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         break;
       case Event.BOOK_MARK:
         //북마크 리스트 상세클릭시
-        contentsBean = new ContentsBean();
         bean = model.getBookmarkList().get(event.getIndex());
-        contentsBean.setTitle(bean.getTitle());
-        contentsBean.setItemNumber(bean.getItemNumber());
-        contentsBean.setImageUrl(bean.getImageUrl());
+        contentsBean = new ContentsBean.Builder(bean, "0").build();
         deliveryHelper.setPackaging(contentsBean);
         go(ScreenID.CONTENTS);
 
         break;
       case Event.CONTENTS:
         //북마크 추천리스트 상세클릭시
-        contentsBean = new ContentsBean();
         bean = model.getDefaultBookmarkList().get(event.getIndex());
-        contentsBean.setTitle(bean.getTitle());
-        contentsBean.setItemNumber(bean.getItemNumber());
-        contentsBean.setImageUrl(bean.getImageUrl());
+        contentsBean = new ContentsBean.Builder(bean, "0").build();
         deliveryHelper.setPackaging(contentsBean);
         go(ScreenID.CONTENTS);
         break;