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

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/ContentsDescriptionBean.java

@@ -0,0 +1,46 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.bean.api;
+
+import com.google.gson.annotations.SerializedName;
+
+import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
+
+/**
+ * ContentsDescriptionBean
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 27.]   [최초 작성]
+ * @since 2018. 11. 27.
+ */
+public class ContentsDescriptionBean extends JsonBeanBase {
+  @SerializedName("itemDtifNo")
+  private String itemDescriptionNumber;
+  @SerializedName("dtalCten")
+  private String description;
+
+  public String getItemDescriptionNumber() {
+    return itemDescriptionNumber;
+  }
+
+  public void setItemDescriptionNumber(String itemDescriptionNumber) {
+    this.itemDescriptionNumber = itemDescriptionNumber;
+  }
+
+  public String getDescription() {
+    return StringUtil.stripHtml(description);
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getDescriptionWithHtml() {
+    return description;
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/ContentsDetailBean.java

@@ -18,15 +18,90 @@ import java.util.List;
  * @since 2018. 11. 22.
  */
 public class ContentsDetailBean extends LifeplusContentsBean {
+  @SerializedName("listType")
+  private String listType;
+  @SerializedName("listAttrType")
+  private String listAttributeType;
+  @SerializedName("seriesTitl")
+  private String seriesTitle;
+  @SerializedName("seriesSubTitl")
+  private String seriesSubTitle;
+
   @SerializedName("itemImagList")
   private List<ContentsDetailImageBean> itemImageList;
 
-  @Override
-  public String getImageUrl() {
+  @SerializedName("itemTagList")
+  private List<TagBean> tagList;
+
+  @SerializedName("itemDtalList") // 이미지 아래 세부 내용
+  private List<ContentsDescriptionBean> descriptionList;
+
+  /**
+   * 이미지 리스트 중에서 첫 번째 것을 가져온다.
+   *
+   * @return
+   */
+  public String getCoverImageUrl() {
     String url = "";
     if (null != itemImageList && itemImageList.size() > 0) {
       url = itemImageList.get(0).getImageUrl();
     }
     return url;
   }
+
+  public String getListType() {
+    return listType;
+  }
+
+  public void setListType(String listType) {
+    this.listType = listType;
+  }
+
+  public String getListAttributeType() {
+    return listAttributeType;
+  }
+
+  public void setListAttributeType(String listAttributeType) {
+    this.listAttributeType = listAttributeType;
+  }
+
+  public String getSeriesTitle() {
+    return seriesTitle;
+  }
+
+  public void setSeriesTitle(String seriesTitle) {
+    this.seriesTitle = seriesTitle;
+  }
+
+  public String getSeriesSubTitle() {
+    return seriesSubTitle;
+  }
+
+  public void setSeriesSubTitle(String seriesSubTitle) {
+    this.seriesSubTitle = seriesSubTitle;
+  }
+
+  public List<ContentsDetailImageBean> getItemImageList() {
+    return itemImageList;
+  }
+
+  public void setItemImageList(List<ContentsDetailImageBean> itemImageList) {
+    this.itemImageList = itemImageList;
+  }
+
+  public List<TagBean> getTagList() {
+    return tagList;
+  }
+
+  public void setTagList(List<TagBean> tagList) {
+    this.tagList = tagList;
+  }
+
+  public List<ContentsDescriptionBean> getDescriptionList() {
+    return descriptionList;
+  }
+
+  public void setDescriptionList(List<ContentsDescriptionBean> descriptionList) {
+    this.descriptionList = descriptionList;
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/ContentsDetailListBean.java

@@ -20,11 +20,11 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
  * @since 2018. 11. 22.
  */
 public class ContentsDetailListBean extends JsonBeanBase {
+
   @SerializedName("itemDtlList")
   private List<ContentsDetailBean> itemDetailList;
-//  @SerializedName("seriesItemList")
-//  private List<> seriesItemList;
-
+  @SerializedName("seriesItemList")
+  private List<SeriesItemBean> seriesItemList;
 
   public List<ContentsDetailBean> getItemDetailList() {
     return itemDetailList;
@@ -33,4 +33,12 @@ public class ContentsDetailListBean extends JsonBeanBase {
   public void setItemDetailList(List<ContentsDetailBean> itemDetailList) {
     this.itemDetailList = itemDetailList;
   }
+
+  public List getSeriesItemList() {
+    return seriesItemList;
+  }
+
+  public void setSeriesItemList(List seriesItemList) {
+    this.seriesItemList = seriesItemList;
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/SeriesItemBean.java

@@ -0,0 +1,17 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.bean.api;
+
+/**
+ * SeriesItemBean
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 27.]   [최초 작성]
+ * @since 2018. 11. 27.
+ */
+public class SeriesItemBean extends LifeplusContentsBean {
+}

app/src/main/java/kr/co/zumo/app/lifeplus/util/StringUtil.java

@@ -206,6 +206,21 @@ public class StringUtil {
     }
   }
 
+  /**
+   * HTML 을 제외한 String 반환
+   *
+   * @param html
+   * @return
+   */
+  public static String stripHtml(String html) {
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+      return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY).toString();
+    }
+    else {
+      return Html.fromHtml(html).toString();
+    }
+  }
+
   /**
    * 폰 번호 스타일 반환 (국내 전용)
    *

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

@@ -48,11 +48,11 @@ public class ContentsOverviewHolder extends RecyclerView.ViewHolder {
 
   public void attach() {
     if (null != contentsDetailBean) {
-      Glide.with(imageViewItem).load(contentsDetailBean.getImageUrl()).into(imageViewItem);
+      Glide.with(imageViewItem).load(contentsDetailBean.getCoverImageUrl()).into(imageViewItem);
       textViewTitle.setText(contentsDetailBean.getTitle());
       if (index == 0) {
         textViewSubTitle.setVisibility(View.GONE);
-        textViewCategoryNumber.setText("Cover");
+        textViewCategoryNumber.setText(R.string.cover);
       }
       else {
         textViewSubTitle.setText(contentsDetailBean.getSubTitle());

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

@@ -278,6 +278,9 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.CONTENTS:
         fragment = new ContentsFragment();
         break;
+      case ScreenID.CONTENTS_NATIVE:
+        fragment = new ContentsDetailFragment();
+        break;
       case ScreenID.OVER_VIEW:
         fragment = new ContentsOverviewFragment();
         break;
@@ -301,9 +304,6 @@ public class BasicFragmentFactory extends FragmentFactory {
       case ScreenID.SERIES:
         fragment = new CategoryMainSeriesFragment();
         break;
-      case ScreenID.CONTENTS_NATIVE:
-        fragment = new ContentsDetailFragment();
-        break;
       default:
         break;
     }

app/src/main/res/values/strings.xml

@@ -673,6 +673,7 @@
   <string name="tag_title">연관태그 추천 콘텐츠 %s개</string>
   <string name="quit_member">탈퇴한 회원입니다.</string>
   <string name="ready_comment">준비 중입니다.</string>
+  <string name="cover">Cover</string>
 
 
 </resources>