ソースを参照

[가입][Bug] 가입 인증 시 coin 값 타입이 맞지 않아 발생하는 버그 수정

hyodong.min 6 年 前
コミット
c27516a641

+ 3 - 0
.idea/gradle.xml

@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

+ 16 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/CoinValueBean.java

@@ -6,6 +6,7 @@ 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;
 
 /**
  * CoinValueBean
@@ -20,13 +21,24 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
 public class CoinValueBean extends JsonBeanBase {
 
   @SerializedName("coin") // 추가된 코인 값
-  private int coin;
+  private String coin;
+  
+//  public String getCoin() {
+//    return coin;
+//  }
 
-  public int getCoin() {
-    return coin;
+  public int getIntCoin() {
+    if (StringUtil.isFull(coin)) {
+      return Integer.parseInt(coin);
+    }
+    return 0;
   }
 
-  public void setCoin(int coin) {
+  public void setCoin(String coin) {
     this.coin = coin;
   }
+
+  public void setIntCoin(int coin) {
+    this.coin = String.valueOf(coin);
+  }
 }

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

@@ -195,7 +195,7 @@ public class GuestCoinManager {
     saveCoinInfoResultBean(manager.getCoinInfoResultBean());
 
     CoinValueBean coinValueBean = new CoinValueBean();
-    coinValueBean.setCoin(coin);
+    coinValueBean.setIntCoin(coin);
     ShareCoinResultBean shareCoinResultBean = new ShareCoinResultBean();
     shareCoinResultBean.setData(coinValueBean);
     shareCoinResultBean.setCode(LifeplusAPIBean.RETURN_SUCCESS);

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsBaseModel.java

@@ -292,8 +292,8 @@ public abstract class ContentsBaseModel extends Model {
     disposableGivenCoin = new APIShareCoinModule().call(requestBean, new APIModuleSimpleListener<ShareCoinResultBean>() {
       @Override
       public void onApiSuccess(ShareCoinResultBean resultBean) {
-        if (null != resultBean.getData() && resultBean.getData().getCoin() > 0) {
-          givenCoin = resultBean.getData().getCoin();
+        if (null != resultBean.getData() && resultBean.getData().getIntCoin() > 0) {
+          givenCoin = resultBean.getData().getIntCoin();
           Log.i("APP# ContentsBaseModel | onApiSuccess", "|" + " givenCoin: " + givenCoin);
           onResult(new Event.Builder(Event.SUCCESS).integer(Event.COIN).build());
         }

+ 1 - 0
app/src/product/java/kr/co/zumo/app/lifeplus/network/api/CoopRetrofitService.java

@@ -3,6 +3,7 @@
  */
 package kr.co.zumo.app.lifeplus.network.api;
 
+import kr.co.zumo.app.lifeplus.network.api.ssl.CoopDevSSLSocketFactoryAssign;
 import okhttp3.OkHttpClient;
 
 /**

+ 1 - 0
app/src/product/java/kr/co/zumo/app/lifeplus/network/api/LifeplusRetrofitService.java

@@ -3,6 +3,7 @@
  */
 package kr.co.zumo.app.lifeplus.network.api;
 
+import kr.co.zumo.app.lifeplus.network.api.ssl.SSLSocketFactoryAssign;
 import okhttp3.OkHttpClient;
 
 /**