[코인][New] 소멸 예정 코인 새 API 적용

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

@@ -18,25 +18,16 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
  * @since 2018. 12. 13.
  */
 public class CoinExtinctionBean extends JsonBeanBase {
+  public static final String DATE_PATTERN = "yyyyMMdd";
   /*
-   {"paymItem" : "thermos","extnPrrmCoin" : "3000","vlidEndDttm" : "20190110"},
+   {"crmmExtnPrrmCoin":"0","vlidEndDttm":"20190131"},
    */
 
-  @SerializedName("paymItem") // 이름
-  private String description;
-  @SerializedName("extnPrrmCoin")  // 코인 값
+  @SerializedName("crmmExtnPrrmCoin")  // 코인 값
   private String coinValue;
   @SerializedName("vlidEndDttm") // 20181010
   private String date;
 
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
   public String getCoinValue() {
     return coinValue;
   }

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

@@ -81,6 +81,7 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
     textPeriod = findViewById(R.id.text_view_select_date2);
 
     //당월 소멸예정 코인 클릭
+    textExpiringCoinValue.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.CLICK).build());});
     textViewExtinctCoin.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.CLICK).build());});
     imageViewExtinctCoinArrow.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.CLICK).build());});
 

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

@@ -4,9 +4,12 @@ import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 
+import java.util.Calendar;
+
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.CoinExtinctionBean;
 import kr.co.zumo.app.lifeplus.util.Formatter;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 
 /**
@@ -36,8 +39,11 @@ public class MyCoinExtinctionContentsViewHolder extends MyCoinExtinctionHolder {
 
   @Override
   public void bind(CoinExtinctionBean bean) {
-    textViewProduct.setText(bean.getDescription());
-    textViewUseDate.setText(Formatter.format(bean.getDate(), "yyyyMMdd", "yyyy.MM.dd"));
+    long millis = Formatter.dateStringToMillis(CoinExtinctionBean.DATE_PATTERN, bean.getDate());
+    Calendar date = Calendar.getInstance();
+    date.setTimeInMillis(millis);
+    textViewProduct.setText(ResourceUtil.getString(R.string.coin_extinct_month, date.get(Calendar.MONTH) + 1));
+    textViewUseDate.setText(Formatter.format(bean.getDate(), CoinExtinctionBean.DATE_PATTERN, "yyyy.MM.dd"));
     textViewUsePrice.setText(StringUtil.toComma(bean.getCoinValue()));
   }
 }

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

@@ -53,6 +53,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
     mainBannerViewCoin = findViewById(R.id.coin_banner_view);
     layoutCoopGoodsContainer = findViewById(R.id.layout_coops_recommend);
 
+    textCoin.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
     textViewMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
     imageViewArrowMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
 

app/src/main/res/layout/fragment_my_coin_detail.xml

@@ -133,7 +133,10 @@
             android:id="@+id/text_expiring_coin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="3dp"
+            android:paddingStart="7dp"
+            android:paddingTop="7dp"
+            android:paddingBottom="7dp"
+            android:paddingEnd="3dp"
             android:lineSpacingExtra="6sp"
             android:textColor="@color/C000000"
             android:textSize="16sp"

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

@@ -631,6 +631,7 @@
 
   <string name="coin_information">코인 정보</string>
   <string name="coin_extinct">소멸예정</string>
+  <string name="coin_extinct_month">%s월 소멸예정</string>
   <string name="coin_extinct_action_bar_title">소멸예정 코인</string>
   <string name="coin_information_title_1">코인이란?</string>
   <string name="coin_information_contents_1">라플앱 내에서 사용 가능한 포인트로\n1coin=1원의 가치를 가집니다.</string>

app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -556,19 +556,23 @@ public class LifeplusAPIService implements LifeplusAPI {
   @Override
   public Single<CoinExtinctionResultBean> getCoinExtinction(RequestBean bean) {
     return Single.fromCallable(() -> {
-      String result = "{ \n" +
-        " \"sp_rtn\":0 ,\n" +
-        " \"rtn_message\" :\"성공\", \n" +
-        " \"data\":[ \n" +
-        "    {\"paymItem\" : \"thermos\",\"extnPrrmCoin\" : \"3000\",\"vlidEndDttm\" : \"20190110\"}, \n" +
-        "    {\"paymItem\" : \"thermos\",\"extnPrrmCoin\" : \"4000\",\"vlidEndDttm\" : \"20190110\"}, \n" +
-        "    {\"paymItem\" : \"thermos\",\"extnPrrmCoin\" : \"5000\",\"vlidEndDttm\" : \"20190110\"}, \n" +
-        "    {\"paymItem\" : \"thermos\",\"extnPrrmCoin\" : \"6000\",\"vlidEndDttm\" : \"20190110\"}, \n" +
-        "    {\"paymItem\" : \"thermos\",\"extnPrrmCoin\" : \"7000\",\"vlidEndDttm\" : \"20190110\"}, \n" +
-        "    {\"paymItem\" : \"thermos\",\"extnPrrmCoin\" : \"8000\",\"vlidEndDttm\" : \"20190110\"}, \n" +
-        "    {\"paymItem\" : \"thermos\",\"extnPrrmCoin\" : \"9000\",\"vlidEndDttm\" : \"20190110\"}, \n" +
-        "    {\"paymItem\" : \"notebook\",\"extnPrrmCoin\" : \"100000\" , \"vlidEndDttm\" : \"20190220\"} \n" +
-        "   ] \n" +
+      String result = "{\n" +
+        "  \"data\": [\n" +
+        "    {\n" +
+        "      \"crmmExtnPrrmCoin\": \"10\",\n" +
+        "      \"vlidEndDttm\": \"20190131\"\n" +
+        "    },\n" +
+        "    {\n" +
+        "      \"crmmExtnPrrmCoin\": \"300\",\n" +
+        "      \"vlidEndDttm\": \"20190228\"\n" +
+        "    },\n" +
+        "    {\n" +
+        "      \"crmmExtnPrrmCoin\": \"6990\",\n" +
+        "      \"vlidEndDttm\": \"20190331\"\n" +
+        "    }\n" +
+        "  ],\n" +
+        "  \"sp_rtn\": 0,\n" +
+        "  \"rtn_message\": \"성공\"\n" +
         "}";
 
       return new Gson().fromJson(result, CoinExtinctionResultBean.class);