Sfoglia il codice sorgente

[코인][New] 비회원 소멸된 코인 표시
- 샘플 데이터 추가: 패널에 "7" 버튼 누르면 이전 10일치 데이터로 세팅 됨

hyodong.min 6 anni fa
parent
commit
5d53933943

+ 16 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/CoinInfoResultBean.java

@@ -21,7 +21,7 @@ public class CoinInfoResultBean extends LifeplusAPIResultListBean<CoinInfoBean>
 
   @SerializedName("poseCoin")       // 보유 코인
   private String coin;
-  @SerializedName("crmmExtnPrrmCoin")   // 당월 소멸 예정 코인
+  @SerializedName("crmmExtnPrrmCoin")   // 당월 소멸 예정 코인, 비회원 일 경우 지금까지 소멸 된 코인
   private String expiringCoin;
 
   public String getCoin() {
@@ -54,4 +54,19 @@ public class CoinInfoResultBean extends LifeplusAPIResultListBean<CoinInfoBean>
   public void setExpiringCoin(String expiringCoin) {
     this.expiringCoin = expiringCoin;
   }
+
+  public int getExpiringIntCoin() {
+    if (StringUtil.isFull(expiringCoin)) {
+      try {
+        return Integer.parseInt(expiringCoin);
+      } catch (Exception e) {
+        return 0;
+      }
+    }
+    return 0;
+  }
+
+  public void setExpiringIntCoin(int expiringCoin) {
+    this.expiringCoin = String.valueOf(expiringCoin);
+  }
 }

+ 6 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/GuestCoinManager.java

@@ -74,11 +74,15 @@ public class GuestCoinManager {
   }
 
   private void modifyCoin(String coin, boolean isMinus) {
+    int coinValue = Integer.parseInt(coin);
     if (isMinus) {
-      coinInfoResultBean.setIntCoin(coinInfoResultBean.getIntCoin() - Integer.parseInt(coin));
+      // 현재 코인 조절
+      coinInfoResultBean.setIntCoin(coinInfoResultBean.getIntCoin() - coinValue);
+      // 소멸된 코인 조절
+      coinInfoResultBean.setExpiringIntCoin(coinInfoResultBean.getExpiringIntCoin() + coinValue);
     }
     else {
-      coinInfoResultBean.setIntCoin(coinInfoResultBean.getIntCoin() + Integer.parseInt(coin));
+      coinInfoResultBean.setIntCoin(coinInfoResultBean.getIntCoin() + coinValue);
     }
   }
 

File diff suppressed because it is too large
+ 17 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainFragment.java


+ 8 - 0
app/src/main/res/layout/fragment_main.xml

@@ -91,6 +91,14 @@
           android:layout_height="wrap_content"
           android:text="Set Dummy Account"/>
 
+        <Button
+          android:id="@+id/button_7"
+          android:padding="0dp"
+          android:minWidth="50dp"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="7"/>
+
         <Space
           android:layout_width="0dp"
           android:layout_height="wrap_content"