浏览代码

- 베네핏 플래그 추가

yeongyun 6 年之前
父节点
当前提交
3bba6956ae

+ 10 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/FlagContentsBean.java

@@ -23,6 +23,8 @@ public class FlagContentsBean extends LifeplusContentsBean {
   private String flagBenefit; // 이벤트
   @SerializedName("specialFlag")
   private String flagSpecial; // 스페셜 그룹
+  @SerializedName("expsBnfYn") // 베네핏
+  private String expsBnfYn;
 
   public String getFlagGet() {
     return flagGet;
@@ -47,4 +49,12 @@ public class FlagContentsBean extends LifeplusContentsBean {
   public void setFlagSpecial(String flagSpecial) {
     this.flagSpecial = flagSpecial;
   }
+
+  public String getExpsBnfYn() {
+    return expsBnfYn;
+  }
+
+  public void setExpsBnfYn(String expsBnfYn) {
+    this.expsBnfYn = expsBnfYn;
+  }
 }

+ 11 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/SearchContentsBean.java

@@ -26,6 +26,9 @@ public class SearchContentsBean extends LifeplusContentsBean {
   @SerializedName("ctgrNo")
   private String categoryNo;
 
+  @SerializedName("expsBnfYn")
+  private String expsBnfYn;
+
   private transient int type = TYPE_ITEM;
   private transient int listCount;
   private transient String tagRequested;
@@ -84,4 +87,12 @@ public class SearchContentsBean extends LifeplusContentsBean {
   public void setCategoryNo(String categoryNo) {
     this.categoryNo = categoryNo;
   }
+
+  public String getExpsBnfYn() {
+    return expsBnfYn;
+  }
+
+  public void setExpsBnfYn(String expsBnfYn) {
+    this.expsBnfYn = expsBnfYn;
+  }
 }

+ 5 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/banner/MainBannerViewHolder.java

@@ -87,7 +87,11 @@ public class MainBannerViewHolder extends RecyclerView.ViewHolder {
     스페셜 최우선, 나머지는 중복되지 않음.
      */
     textFlag.setAlpha(1f);
-    if (APIData.isTrue(bean.getFlagBenefit())) {
+
+    if(APIData.isTrue(bean.getExpsBnfYn())) {
+      textFlag.setText(R.string.main_flag_benefit);
+    }
+    else if (APIData.isTrue(bean.getFlagBenefit())) {
       textFlag.setText(R.string.main_flag_benefit);
     }
     else {

+ 5 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/CategoryMainViewHolder.java

@@ -49,10 +49,13 @@ public abstract class CategoryMainViewHolder<T extends CategoryContentsBean> ext
     스페셜 최우선, 나머지는 중복되지 않음.
      */
     textFlag.setAlpha(1f);
+    if(APIData.isTrue(bean.getExpsBnfYn())) {
+      textFlag.setText(R.string.main_flag_benefit);
+    }
     /*if (APIData.isTrue(bean.getFlagSpecial())) {
       textFlag.setText(R.string.main_flag_special);
-    }
-    else */if (APIData.isTrue(bean.getFlagBenefit())) {
+    }*/
+    else if (APIData.isTrue(bean.getFlagBenefit())) {
       textFlag.setText(R.string.main_flag_benefit);
     }
     /*else if (APIData.isTrue(bean.getFlagGet())) {

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainCategoryContentsImageView.java

@@ -415,7 +415,9 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
     스페셜 최우선, 나머지는 중복되지 않음.
      */
         textFlag.setAlpha(1f);
-        if (APIData.isTrue(bean.getFlagSpecial())) {
+        if(APIData.isTrue(bean.getExpsBnfYn())) {
+            textFlag.setText(R.string.main_flag_benefit);
+        } else if (APIData.isTrue(bean.getFlagSpecial())) {
             textFlag.setText(R.string.main_flag_special);
         } else if (APIData.isTrue(bean.getFlagBenefit())) {
             textFlag.setText(R.string.main_flag_benefit);

+ 19 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchResultHolder.java

@@ -5,7 +5,11 @@ package kr.co.zumo.app.lifeplus.view.screen.search;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.widget.TextView;
 
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.APIData;
+import kr.co.zumo.app.lifeplus.bean.api.FlagContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.SearchContentsBean;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -25,4 +29,19 @@ public abstract class SearchResultHolder extends RecyclerView.ViewHolder {
   }
 
   public abstract void bind(SearchContentsBean bean, IEventListener listener);
+
+  protected void showFlag(TextView textFlag, SearchContentsBean bean) {
+
+    // flag 노출
+    /*
+    스페셜 최우선, 나머지는 중복되지 않음.
+     */
+    textFlag.setAlpha(1f);
+    if(APIData.isTrue(bean.getExpsBnfYn())) {
+      textFlag.setText(R.string.main_flag_benefit);
+    }
+    else {
+      textFlag.setAlpha(0f);
+    }
+  }
 }

+ 4 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchResultItemHolder.java

@@ -29,12 +29,14 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
 public class SearchResultItemHolder extends SearchResultHolder {
   protected ImageView imageResult;
   protected TextView textTitle;
+  private TextView textFlag;
 
   public SearchResultItemHolder(View itemView) {
     super(itemView);
 
     imageResult = itemView.findViewById(R.id.image_view_result);
     textTitle = itemView.findViewById(R.id.text_title);
+    textFlag = itemView.findViewById(R.id.text_flag);
 
   }
 
@@ -57,6 +59,8 @@ public class SearchResultItemHolder extends SearchResultHolder {
       detachEvent(imageResult);
       detachEvent(textTitle);
     }
+
+    showFlag(textFlag, bean);
   }
 
   private void detachEvent(View view) {

+ 19 - 0
app/src/main/res/layout/search_result_item_view.xml

@@ -39,4 +39,23 @@
     app:layout_constraintVertical_chainStyle="packed"
     tools:text="집순이 집돌이가 제일 집순이 집돌이가 제일 집순이 집돌이가 제일 집순이 집돌이가 제일 좋아하는 취미 BEST 5"/>
 
+  <TextView
+      android:id="@+id/text_flag"
+      android:layout_width="wrap_content"
+      android:layout_height="16dp"
+      android:layout_marginStart="12dp"
+      android:layout_marginTop="6dp"
+      android:layout_marginEnd="6dp"
+      android:alpha="0"
+      android:background="@color/CFF0053"
+      android:gravity="center"
+      android:minWidth="38dp"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="9dp"
+      android:textStyle="bold"
+      app:layout_constraintStart_toStartOf="@+id/image_view_result"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:alpha="1"
+      tools:text="Get"/>
+
 </android.support.constraint.ConstraintLayout>