[마이][New] 코인 디테일 API 추가 - API 매칭 완료

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

@@ -19,14 +19,17 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
  */
 public class CoinInfoBean extends JsonBeanBase {
   /*
-   {"goodName" : "thermos","goodAmt" : "3000", "cponUsyn" : "Y" , "purcDate" : "20181010"},
+   {"goodName" : "thermos","goodAmt" : "3000", "cponUsyn" : "적립/사용" , "purcDate" : "20181010"},
    */
 
+  public static final String FLAG_PLUS = "적립";
+  public static final String FLAG_MINUS = "사용";
+
   @SerializedName("goodName") // 이름
   private String goodsName;
   @SerializedName("goodAmt")  // 코인 값
   private String goodsAmount;
-  @SerializedName("cponUsyn") // 증감 Y = -, N = +
+  @SerializedName("acUseDvsn") // 증감 적립/사용
   private String decreasing;
   @SerializedName("purcDate") // 20181010
   private String date;

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

@@ -45,9 +45,9 @@ public class CoinInfoRequestBean extends RequestBean {
   public @interface Period {}
 
   public static final String FLAG_NONE = "";
-  public static final String FLAG_ALL = "A";
-  public static final String FLAG_PLUS = "+";
-  public static final String FLAG_MINUS = "-";
+  public static final String FLAG_ALL = "전체";
+  public static final String FLAG_PLUS = "적립";
+  public static final String FLAG_MINUS = "사용";
 
   @Retention(RetentionPolicy.SOURCE)
   @StringDef({
@@ -55,17 +55,17 @@ public class CoinInfoRequestBean extends RequestBean {
   })
   public @interface Flag {}
 
-  @SerializedName("start")
-  private String periodStart;
-  @SerializedName("end")
-  private String periodEnd;
+  @SerializedName("srchFromDt")
+  private String periodFrom;
+  @SerializedName("srchToDt")
+  private String periodTo;
 
-  @SerializedName("flag")
+  @SerializedName("acUseDvsn")
   private String flag;    // 전체/적립/사용
 
-  public CoinInfoRequestBean(String periodStart, String periodEnd, @Flag String flag) {
-    this.periodStart = periodStart;
-    this.periodEnd = periodEnd;
+  public CoinInfoRequestBean(String periodFrom, String periodTo, @Flag String flag) {
+    this.periodFrom = periodFrom;
+    this.periodTo = periodTo;
     this.flag = flag;
   }
 
@@ -73,8 +73,8 @@ public class CoinInfoRequestBean extends RequestBean {
    * 코인 값만 필요할 경우
    */
   public CoinInfoRequestBean() {
-    this.periodStart = "";
-    this.periodEnd = "";
+    this.periodFrom = "";
+    this.periodTo = "";
     this.flag = FLAG_NONE;
   }
 }

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

@@ -17,11 +17,9 @@ import com.google.gson.annotations.SerializedName;
  */
 public class CoinInfoResultBean extends LifeplusAPIResultListBean<CoinInfoBean> {
 
-  // todo 코인 값, 소멸 예정 값 추가 예정.
-
-  @SerializedName("coin")
+  @SerializedName("poseCoin")       // 보유 코인
   private String coin;
-  @SerializedName("expiringCoin")
+  @SerializedName("crmmExtnPrrmCoin")   // 당월 소멸 예정 코인
   private String expiringCoin;
 
   public String getCoin() {

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

@@ -5,8 +5,8 @@ import android.widget.TextView;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.CoinInfoBean;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusData;
 import kr.co.zumo.app.lifeplus.util.Formatter;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -38,7 +38,9 @@ public class MyCoinDetailItemViewHolder extends MyCoinDetailViewHolder {
   @Override
   public void bind(CoinInfoBean bean, IEventListener listener) {
     if (null != bean) {
-      boolean isMinus = LifeplusData.isTrue(bean.getDecreasing());
+      String decreasing = bean.getDecreasing();
+      boolean isMinus = CoinInfoBean.FLAG_MINUS.equals(decreasing);
+
       textViewCoinUseTitle.setText(bean.getGoodsName());
       String date = bean.getDate();
       if (StringUtil.isFull(date) && date.length() == 8) {
@@ -47,7 +49,7 @@ public class MyCoinDetailItemViewHolder extends MyCoinDetailViewHolder {
       else {
         textViewCoinUseDate.setText(null == date ? "" : date);
       }
-      textViewCoinUseFlag.setText(isMinus ? "사용" : "적립");   // 사용 적립
+      textViewCoinUseFlag.setText(ResourceUtil.getString(isMinus ? R.string.coin_minus : R.string.coin_plus));   // 사용 적립
       textViewCoinUseDetail.setText(String.format("%s%s", isMinus ? "-" : "", bean.getGoodsAmount()));  // -4000
     }
     else {

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

@@ -746,5 +746,8 @@
   <string name="undefined_list_type">데이터가 없습니다.</string>
   <string name="show_map">지도보기</string>
 
+  <string name="coin_minus" >사용</string>
+  <string name="coin_plus" >적립</string>
+
   <!-- 임의 추가 문자열 : 끝 -->
 </resources>