[코인][New] 코인 지급 팝업 실행 시 자신의 코인 값을 항상 서버로부터 로드하여 표시, CoinModel 추가

app/src/main/java/kr/co/zumo/app/lifeplus/model/CoinModel.java

@@ -0,0 +1,69 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model;
+
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
+
+/**
+ * CoinModel
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2019-02-10]   [최초 작성]
+ * @since 2019-02-10
+ */
+public abstract class CoinModel extends Model {
+
+  private int givenCoin;
+
+  /**
+   * 지급된 코인 값 설정
+   *
+   * @param givenCoin
+   */
+  public void setGivenCoin(int givenCoin) {
+    this.givenCoin = givenCoin;
+  }
+
+  /**
+   * 지급된 코인 값
+   *
+   * @return
+   */
+  public int getGivenCoin() {
+    return givenCoin;
+  }
+
+  /**
+   * 현재 코인 값 - 지급된 코인 값
+   * - 지급된 코인를 표시하려고 코인 정보를 로드한 시점에는 이미 지급된 코인이 반영돼있으므로, 지급된 금액을 빼줌
+   *
+   * @return
+   */
+  public int getPrevCoin() {
+    return Integer.parseInt(CoinModelHelper.getInstance().getCoin()) - givenCoin;
+  }
+
+  /**
+   * 현재 코인 값을 로딩
+   * - 언제나 API 를 통해서 현재 정보를 가져온다.
+   *
+   * @param listener
+   */
+  public void getCoinAsync(IEventListener listener) {
+    CoinModelHelper.getInstance().getCoinAsync(listener);
+  }
+
+  /**
+   * 코인 지급 완료
+   */
+  public void mergeCoin() {
+    // 이미 반영되었으므로 더하지 않는다.
+//    CoinModelHelper.getInstance().addCoin(givenCoin);
+    givenCoin = 0;
+  }
+}

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

@@ -16,7 +16,7 @@ import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusData;
 import kr.co.zumo.app.lifeplus.bean.api.ShareCoinRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.ShareCoinResultBean;
-import kr.co.zumo.app.lifeplus.model.Model;
+import kr.co.zumo.app.lifeplus.model.CoinModel;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
 import kr.co.zumo.app.lifeplus.model.module.APIShareCoinModule;
@@ -24,9 +24,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
 import kr.co.zumo.app.lifeplus.tool.Share;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 
 /**
  * ContentsBaseModel
@@ -38,7 +36,7 @@ import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
  * @history 민효동   [2018. 11. 6.]   [최초 작성]
  * @since 2018. 11. 6.
  */
-public abstract class ContentsBaseModel extends Model {
+public abstract class ContentsBaseModel extends CoinModel {
 
   private Disposable disposableLiked;
   private Disposable disposableBookmarked;
@@ -292,8 +290,8 @@ public abstract class ContentsBaseModel extends Model {
       @Override
       public void onApiSuccess(ShareCoinResultBean resultBean) {
         if (null != resultBean.getData() && resultBean.getData().getIntCoin() > 0) {
-          givenCoin = resultBean.getData().getIntCoin();
-          Log.i("APP# ContentsBaseModel | onApiSuccess", "|" + " givenCoin: " + givenCoin);
+          setGivenCoin(resultBean.getData().getIntCoin());
+          Log.i("APP# ContentsBaseModel | onApiSuccess", "|" + " givenCoin: " + getGivenCoin());
           onResult(new Event.Builder(Event.SUCCESS).integer(Event.COIN).build());
         }
       }
@@ -305,23 +303,4 @@ public abstract class ContentsBaseModel extends Model {
     });
   }
 
-  // coin --------------------------------------
-  protected int givenCoin = 0;
-  public int getGivenCoin() {
-    return givenCoin;
-  }
-
-  public String getCoin() {
-    return CoinModelHelper.getInstance().getCoin();
-  }
-
-  public void getCoinAsync(IEventListener listener) {
-    CoinModelHelper.getInstance().getCoinAsync(listener);
-  }
-
-  public void mergeCoin() {
-    CoinModelHelper.getInstance().addCoin(givenCoin);
-    givenCoin = 0;
-  }
-  // coin --------------------------------------
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsBasePresenter.java

@@ -165,21 +165,21 @@ public abstract class ContentsBasePresenter<M extends ContentsBaseModel, V exten
   }
 
   protected void loadShareCoin(@Share.Type String type) {
-    coinChecker = new DoubleChecker(this::showCoin);
-    // 보유 코인 우선 로딩 -> 코인 적립을 먼저하면 이전 값과 더한 값의 차이가 있을 수 있다.
-    model.getCoinAsync(e -> {
-      Log.i("APP# ContentsBasePresenter | onResult", "|" + " current coin: " + e.getInteger());
-      model.loadShareCoin(type);
+    // 더블 체커 세팅
+    coinChecker = new DoubleChecker(() -> {
+      coinChecker = null;
+
+      // 보유 코인 우선 로딩 -> 코인 적립을 먼저하면 이전 값과 더한 값의 차이가 있을 수 있다.
+      model.getCoinAsync(e -> {
+        Log.i("APP# ContentsBasePresenter | onResult", "|" + " current coin: " + e.getInteger());
+        new CoinPopupDriver(getFragmentManager(), () -> {}, () -> {})
+          .show(model.getPrevCoin(), model.getGivenCoin(), R.string.coin_share_contents);
+
+        model.mergeCoin();
+      });
     });
-  }
-
-  private void showCoin() {
-    coinChecker = null;
-    new CoinPopupDriver(getFragmentManager(), () -> {
-      // nothing
-    }, () -> {}).show(Integer.parseInt(model.getCoin()), model.getGivenCoin(), R.string.coin_share_contents);
 
-    model.mergeCoin();
+    model.loadShareCoin(type);
   }
 
   protected void showShareDialog() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventDetailSelectPresenter.java

@@ -94,7 +94,7 @@ public class EventDetailSelectPresenter extends Presenter<EventDetailModel, IEve
       //참여하기 클릭
       case Event.CLICK:
         if (model.isActiveMember()) {
-          showCoinSavingDialog();
+//          showCoinSavingDialog();
           go(ScreenID.EVENT_QUESTION);
         }
         else {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainModel.java

@@ -40,7 +40,7 @@ import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.WeatherBean;
 import kr.co.zumo.app.lifeplus.bean.api.WeatherRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.WeatherResultBean;
-import kr.co.zumo.app.lifeplus.model.Model;
+import kr.co.zumo.app.lifeplus.model.CoinModel;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APILoginStatusMapper;
@@ -52,10 +52,8 @@ import kr.co.zumo.app.lifeplus.model.module.APIPopupLoadModule;
 import kr.co.zumo.app.lifeplus.model.module.coop.APIWeatherModule;
 import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.SettingViewHolder;
 
 /**
@@ -68,7 +66,7 @@ import kr.co.zumo.app.lifeplus.view.screen.setting.SettingViewHolder;
  * @history 민효동   [2018-10-07]   [최초 작성]
  * @since 2018-10-07
  */
-public class MainModel extends Model {
+public class MainModel extends CoinModel {
 
   private static final String NETWORK = "network";
   private static final String GPS = "gps";
@@ -242,34 +240,6 @@ public class MainModel extends Model {
     this.index = index;
   }
 
-
-  // coin --------------------------------------
-  private int givenCoin;
-
-  public void setGivenCoin(int givenCoin) {
-    this.givenCoin = givenCoin;
-  }
-
-  public int getGivenCoin() {
-    return givenCoin;
-  }
-
-  public String getCoin() {
-    return CoinModelHelper.getInstance().getCoin();
-  }
-
-  public void getCoinAsync(IEventListener listener) {
-    CoinModelHelper.getInstance().getCoinAsync(listener);
-  }
-
-  public void mergeCoin() {
-    CoinModelHelper.getInstance().addCoin(givenCoin);
-    givenCoin = 0;
-  }
-
-  // coin --------------------------------------
-
-
   /**
    * 날씨 처음 로딩
    */

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainPresenter.java

@@ -103,7 +103,7 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
           model.loadPopupInfo();
         }, () -> {
           model.loadPopupInfo();
-        }).show(Integer.parseInt(model.getCoin()), model.getGivenCoin(), R.string.coin_long_time_no_see);
+        }).show(model.getPrevCoin(), model.getGivenCoin(), R.string.coin_long_time_no_see);
 
         model.mergeCoin();
       });

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/member/MemberRestStartPresenter.java

@@ -101,7 +101,13 @@ public class MemberRestStartPresenter extends Presenter<RestMemberModel, IView>
         if (model.getGivenCoin() > 0) {
           model.getCoinAsync(e -> {
             Log.i("APP# MemberRestStartPresenter | onResult", "|" + " current coin: " + e.getInteger());
-            showCoin();
+            new CoinPopupDriver(getFragmentManager(), () -> {
+              next();
+            }, () -> {
+              next();
+            }).show(model.getPrevCoin(), model.getGivenCoin(), R.string.coin_unrest_completed);
+
+            model.mergeCoin();
           });
         }
         else {
@@ -125,13 +131,4 @@ public class MemberRestStartPresenter extends Presenter<RestMemberModel, IView>
     go(ScreenID.REST_MEMBER_ACTIVE_COMPLETED);
   }
 
-  private void showCoin() {
-    new CoinPopupDriver(getFragmentManager(), () -> {
-      next();
-    }, () -> {
-      next();
-    }).show(Integer.parseInt(model.getCoin()), model.getGivenCoin(), R.string.coin_unrest_completed);
-
-    model.mergeCoin();
-  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/member/RestMemberModel.java

@@ -6,14 +6,12 @@ package kr.co.zumo.app.lifeplus.view.screen.member;
 import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.lifeplus.bean.api.MemberActivateResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
-import kr.co.zumo.app.lifeplus.model.Model;
+import kr.co.zumo.app.lifeplus.model.CoinModel;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIMemberActivateModule;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IEventListener;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 
 /**
  * RestMemberModel
@@ -25,7 +23,7 @@ import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
  * @history 민효동   [2018. 10. 8.]   [최초 작성]
  * @since 2018. 10. 8.
  */
-public class RestMemberModel extends Model {
+public class RestMemberModel extends CoinModel {
 
   Disposable disposable;
 
@@ -84,7 +82,7 @@ public class RestMemberModel extends Model {
       @Override
       public void onApiSuccess(MemberActivateResultBean resultBean) {
 
-        givenCoin = resultBean.getData().getIntCoin();
+        setGivenCoin(resultBean.getData().getIntCoin());
 
         SuperModel.getInstance().deleteMemberStatus(SuperModel.MEMBER_STATUS_BIT_REST);
         onResult(new Event.Builder(Event.SUCCESS).build());
@@ -96,25 +94,4 @@ public class RestMemberModel extends Model {
       }
     });
   }
-
-  // coin --------------------------------------
-  private int givenCoin;
-
-  public int getGivenCoin() {
-    return givenCoin;
-  }
-
-  public String getCoin() {
-    return CoinModelHelper.getInstance().getCoin();
-  }
-
-  public void getCoinAsync(IEventListener listener) {
-    CoinModelHelper.getInstance().getCoinAsync(listener);
-  }
-
-  public void mergeCoin() {
-    CoinModelHelper.getInstance().addCoin(givenCoin);
-    givenCoin = 0;
-  }
-  // coin --------------------------------------
 }

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

@@ -103,10 +103,16 @@ public class CoinModelHelper {
    * @param listener
    */
   public void getCoinAsync(IEventListener listener) {
-    if (StringUtil.isFull(coin) && Integer.parseInt(coin) > 0) {
-      listener.onEvent(new Event.Builder(Event.SUCCESS).integer(Integer.parseInt(coin)).build());
-    }
-    else {
+    /**
+     * todo 기존 코인 값이 있을 땐 문제가 없지만,
+     * 자신의 코인 정보를 로딩 후 지급 된 코인을 더하면 이중으로 더해져 값이 맞지 않는다.
+     * - 우선은 필요할 경우 항상 로딩
+     */
+//    if (StringUtil.isFull(coin) && Integer.parseInt(coin) > 0) {
+//      listener.onEvent(new Event.Builder(Event.SUCCESS).integer(Integer.parseInt(coin)).build());
+//    }
+//    else
+    {
       loadCoinInfo(new CoinInfoRequestBean(), new APIModuleListener<CoinInfoResultBean>() {
         @Override
         public void onApiSuccess(CoinInfoResultBean resultBean) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/code/SettingCodeModel.java

@@ -12,15 +12,13 @@ import kr.co.zumo.app.lifeplus.bean.api.MemberCodeResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.SettingMemberBean;
 import kr.co.zumo.app.lifeplus.bean.api.SettingMemberResultBean;
-import kr.co.zumo.app.lifeplus.model.Model;
+import kr.co.zumo.app.lifeplus.model.CoinModel;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.APIMemberCodeRegisterModule;
-import kr.co.zumo.app.lifeplus.model.module.APIModuleReasonListener;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
+import kr.co.zumo.app.lifeplus.model.module.APIModuleReasonListener;
 import kr.co.zumo.app.lifeplus.model.verify.Verifier;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IEventListener;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.MemberInfoModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.SettingModelHelper;
 
@@ -34,7 +32,7 @@ import kr.co.zumo.app.lifeplus.view.screen.setting.SettingModelHelper;
  * @history 민효동   [2018. 10. 25.]   [최초 작성]
  * @since 2018. 10. 25.
  */
-public class SettingCodeModel extends Model {
+public class SettingCodeModel extends CoinModel {
 
   private Disposable disposableLoading;
   private Disposable disposableRegister;
@@ -237,26 +235,6 @@ public class SettingCodeModel extends Model {
     disposeObservable();
   }
 
-  // coin --------------------------------------
-  private int givenCoin;
-  public int getGivenCoin() {
-    return givenCoin;
-  }
-
-  public String getCoin() {
-    return CoinModelHelper.getInstance().getCoin();
-  }
-
-  public void getCoinAsync(IEventListener listener) {
-    CoinModelHelper.getInstance().getCoinAsync(listener);
-  }
-
-  public void mergeCoin() {
-    CoinModelHelper.getInstance().addCoin(givenCoin);
-    givenCoin = 0;
-  }
-  // coin --------------------------------------
-
   public static final int CODE_SPECIAL_RESULT_INDEX = 0;
   public static final int CODE_RECOMMEND_RESULT_INDEX = 1;
 
@@ -290,7 +268,7 @@ public class SettingCodeModel extends Model {
           SettingModelHelper.getInstance().setRecommendName(codeBean.getRecommendName());
           SettingModelHelper.getInstance().setSpecialCodeType(codeBean.getSpecialCodeType());
           SettingModelHelper.getInstance().setIncreasedCoin(codeBean.getIntCoin());
-          givenCoin = codeBean.getIntCoin();
+          setGivenCoin(codeBean.getIntCoin());
         }
 
         if (Verifier.isOk(verifySpecialCodeInternal(specialCode))) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/code/SettingCodePresenter.java

@@ -130,7 +130,7 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
 
   private void showCoin() {
     boolean[] codeResult = model.getCodeResult();
-    int currentCoin = Integer.parseInt(model.getCoin());
+    int prevCoin = model.getPrevCoin();
     int givenCoin = model.getGivenCoin();
 
     Log.i("APP# SettingCodePresenter | showCoin", "|" + Arrays.toString(codeResult));
@@ -141,26 +141,26 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
       new CoinPopupDriver(getFragmentManager(), () -> {
         // 완료 뒤 추천 코드 있으면 표시
         if (codeResult[SettingCodeModel.CODE_RECOMMEND_RESULT_INDEX]) {
-          showRecommendCoin(currentCoin, givenCoin);
+          showRecommendCoin(prevCoin, givenCoin);
         }
         else {
           onBackPressed();
         }
-      }, () -> {}).show(Integer.parseInt(model.getCoin()), model.getGivenCoin(), R.string.coin_special_code_completed);
+      }, () -> {}).show(prevCoin, model.getGivenCoin(), R.string.coin_special_code_completed);
 
     }
     else if (codeResult[SettingCodeModel.CODE_RECOMMEND_RESULT_INDEX]) {
       // 추천 코드 있으면 표시
-      showRecommendCoin(currentCoin, givenCoin);
+      showRecommendCoin(prevCoin, givenCoin);
     }
 
     model.mergeCoin();
   }
 
-  private void showRecommendCoin(int currentCoin, int givenCoin) {
+  private void showRecommendCoin(int prevCoin, int givenCoin) {
     new CoinPopupDriver(getFragmentManager(), () -> {
       onBackPressed();
-    }, () -> {}).show(currentCoin, givenCoin, R.string.coin_recommend_code_completed);
+    }, () -> {}).show(prevCoin, givenCoin, R.string.coin_recommend_code_completed);
   }
 
   private void onInvalidCode(int resultIndex) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpBaseModel.java

@@ -3,7 +3,7 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.signup;
 
-import kr.co.zumo.app.lifeplus.model.Model;
+import kr.co.zumo.app.lifeplus.model.CoinModel;
 
 /**
  * SignUpMobileAuthModel
@@ -15,7 +15,7 @@ import kr.co.zumo.app.lifeplus.model.Model;
  * @history 민효동   [2018. 9. 21.]   [최초 작성]
  * @since 2018. 9. 21.
  */
-public abstract class SignUpBaseModel extends Model {
+public abstract class SignUpBaseModel extends CoinModel {
 
   public boolean isOnBoardingStarted() {
     return SignUpModelHelper.getInstance().isOnBoardingStarted();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpCompletePresenter.java

@@ -39,19 +39,14 @@ public class SignUpCompletePresenter extends Presenter<SignUpCompletedModel, ISi
     if (model.getGivenCoin() > 0) {
       model.getCoinAsync(e -> {
         Log.i("APP# SignUpAgreePresenter | onResult", "|" + " current coin: " + e.getInteger());
-        showCoin();
+        new CoinPopupDriver(getFragmentManager(), () -> {}, () -> {})
+          .show(model.getPrevCoin(), model.getGivenCoin(), model.getCoinGivenStringId());
+
+        model.mergeCoin();
       });
     }
   }
 
-  private void showCoin() {
-    new CoinPopupDriver(getFragmentManager(), () -> {
-    }, () -> {
-    }).show(Integer.parseInt(model.getCoin()), model.getGivenCoin(), model.getCoinGivenStringId());
-
-    model.mergeCoin();
-  }
-
   @Override
   protected void stopInternal() {
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpCompletedModel.java

@@ -4,8 +4,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.signup;
 
 import kr.co.zumo.app.lifeplus.bean.MobileAuthBean;
-import kr.co.zumo.app.lifeplus.view.IEventListener;
-import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 
 /**
  * SignUpCompletedModel
@@ -21,7 +19,7 @@ public class SignUpCompletedModel extends SignUpBaseModel {
 
 
   public SignUpCompletedModel() {
-    givenCoin = SignUpModelHelper.getInstance().getGivenCoin();
+    setGivenCoin(SignUpModelHelper.getInstance().getGivenCoin());
   }
 
   @Override
@@ -63,24 +61,4 @@ public class SignUpCompletedModel extends SignUpBaseModel {
   }
 
 
-  // coin --------------------------------------
-  private int givenCoin;
-
-  public int getGivenCoin() {
-    return givenCoin;
-  }
-
-  public String getCoin() {
-    return CoinModelHelper.getInstance().getCoin();
-  }
-
-  public void getCoinAsync(IEventListener listener) {
-    CoinModelHelper.getInstance().getCoinAsync(listener);
-  }
-
-  public void mergeCoin() {
-    CoinModelHelper.getInstance().addCoin(givenCoin);
-    givenCoin = 0;
-  }
-  // coin --------------------------------------
 }