Explorar o código

[설정][Common] SettingModelHelper refactoring

hyodong.min %!s(int64=6) %!d(string=hai) anos
pai
achega
561d0026c3

+ 41 - 11
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingModelHelper.java

@@ -39,22 +39,37 @@ public class SettingModelHelper {
   private int increasedCoin = 0;
   private String currentCoin = "";
 
-  public String getRecommendName() {
+  /**
+   * 새로 등록한 추천인 이름
+   *
+   * @return
+   */
+  public String getUpdatedRecommendName() {
     return recommendName;
   }
 
-  public void setRecommendName(String recommendName) {
+  public void setUpdatedRecommendName(String recommendName) {
     this.recommendName = recommendName;
   }
 
-  public String getSpecialCodeType() {
+  /**
+   * 새로 등록한 스페셜 코드 타입
+   *
+   * @return
+   */
+  public String getUpdatedSpecialCodeType() {
     return specialCodeType;
   }
 
-  public void setSpecialCodeType(String specialCodeType) {
+  public void setUpdatedSpecialCodeType(String specialCodeType) {
     this.specialCodeType = specialCodeType;
   }
 
+  /**
+   * 코드 등록으로 증가한 코인 값
+   *
+   * @return
+   */
   public int getIncreasedCoin() {
     return increasedCoin;
   }
@@ -63,6 +78,11 @@ public class SettingModelHelper {
     this.increasedCoin = increasedCoin;
   }
 
+  /**
+   * 현재 코인 값
+   *
+   * @return
+   */
   public String getCurrentCoin() {
     return currentCoin;
   }
@@ -71,27 +91,37 @@ public class SettingModelHelper {
     this.currentCoin = currentCoin;
   }
 
-  public String getSpecialCode() {
+  /**
+   * 새로 등록한 스페셜 코드
+   *
+   * @return
+   */
+  public String getUpdatedSpecialCode() {
     return specialCode;
   }
 
-  public void setSpecialCode(String specialCode) {
+  public void setUpdatedSpecialCode(String specialCode) {
     this.specialCode = specialCode;
   }
 
-  public String getRecommendCode() {
+  /**
+   * 새로 등록한 추천인 코드
+   *
+   * @return
+   */
+  public String getUpdatedRecommendCode() {
     return recommendCode;
   }
 
-  public void setRecommendCode(String recommendCode) {
+  public void setUpdatedRecommendCode(String recommendCode) {
     this.recommendCode = recommendCode;
   }
 
   private void setSettingMemberBean(SettingMemberBean settingMemberBean) {
     if (null != settingMemberBean) {
-      setRecommendCode(settingMemberBean.getRecommendCode());
-      setSpecialCode(settingMemberBean.getSpecialCode());
-      setSpecialCodeType(settingMemberBean.getSpecialCodeType());
+      setUpdatedRecommendCode(settingMemberBean.getRecommendCode());
+      setUpdatedSpecialCode(settingMemberBean.getSpecialCode());
+      setUpdatedSpecialCodeType(settingMemberBean.getSpecialCodeType());
     }
   }
 

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

@@ -176,11 +176,11 @@ public class SettingCodeModel extends CoinModel {
   }
 
   private void parseCodes() {
-    loadedSpecialCode = SettingModelHelper.getInstance().getSpecialCode();
+    loadedSpecialCode = SettingModelHelper.getInstance().getUpdatedSpecialCode();
     if (null == loadedSpecialCode) {
       loadedSpecialCode = "";
     }
-    loadedRecommendCode = SettingModelHelper.getInstance().getRecommendCode();
+    loadedRecommendCode = SettingModelHelper.getInstance().getUpdatedRecommendCode();
     if (null == loadedRecommendCode) {
       loadedRecommendCode = "";
     }
@@ -249,21 +249,21 @@ public class SettingCodeModel extends CoinModel {
         isRegistered = true;
 
         if (null != codeBean) {
-          SettingModelHelper.getInstance().setRecommendName(codeBean.getRecommendName());
-          SettingModelHelper.getInstance().setSpecialCodeType(codeBean.getSpecialCodeType());
+          SettingModelHelper.getInstance().setUpdatedRecommendName(codeBean.getRecommendName());
+          SettingModelHelper.getInstance().setUpdatedSpecialCodeType(codeBean.getSpecialCodeType());
           MemberInfoModelHelper.getInstance().setSpecialCodeType(codeBean.getSpecialCodeType());
           SettingModelHelper.getInstance().setIncreasedCoin(codeBean.getIntCoin());
           setGivenCoin(codeBean.getIntCoin());
         }
 
         if (Verifier.isOk(verifySpecialCodeInternal(specialCode))) {
-          SettingModelHelper.getInstance().setSpecialCode(specialCode);
+          SettingModelHelper.getInstance().setUpdatedSpecialCode(specialCode);
           MemberInfoModelHelper.getInstance().setSpecialCode(recommendCode);
           codeResult[CODE_SPECIAL_RESULT_INDEX] = true;
         }
 
         if (Verifier.isOk(verifyRecommendCodeInternal(recommendCode))) {
-          SettingModelHelper.getInstance().setRecommendCode(recommendCode);
+          SettingModelHelper.getInstance().setUpdatedRecommendCode(recommendCode);
           MemberInfoModelHelper.getInstance().setRecommendCode(recommendCode);
           codeResult[CODE_RECOMMEND_RESULT_INDEX] = true;
         }
@@ -366,16 +366,16 @@ public class SettingCodeModel extends CoinModel {
    *
    * @return
    */
-  public String getRecommendName() {
-    return SettingModelHelper.getInstance().getRecommendName();
+  public String getUpdatedRecommendName() {
+    return SettingModelHelper.getInstance().getUpdatedRecommendName();
   }
 
   /**
    * 추천인 이름 제거
    * - 토스트 표시 후 제거해줌
    */
-  public void clearRecommendName() {
-    SettingModelHelper.getInstance().setRecommendName("");
+  public void clearUpdatedRecommendName() {
+    SettingModelHelper.getInstance().setUpdatedRecommendName("");
   }
 
   /**
@@ -384,16 +384,16 @@ public class SettingCodeModel extends CoinModel {
    *
    * @return
    */
-  public String getSpecialCodeType() {
-    return SettingModelHelper.getInstance().getSpecialCodeType();
+  public String getUpdatedSpecialCodeType() {
+    return SettingModelHelper.getInstance().getUpdatedSpecialCodeType();
   }
 
   /**
    * 스페셜 코드 제거
    * - 토스트 표시 후 제거해줌
    */
-  public void clearSpecialCodeType() {
-    SettingModelHelper.getInstance().setSpecialCodeType("");
+  public void clearUpdatedSpecialCodeType() {
+    SettingModelHelper.getInstance().setUpdatedSpecialCodeType("");
   }
 
   /**

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

@@ -132,26 +132,26 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
       - 스페셜 코드가 있으면 팝업
       - 추천인 이름이 있으면 팝업 (코인 표시)
      */
-    if (StringUtil.isFull(model.getSpecialCodeType())) {
+    if (StringUtil.isFull(model.getUpdatedSpecialCodeType())) {
       showCustomToast(
         ResourceUtil.getString(R.string.special_code_confirm_success),
-        String.format(ResourceUtil.getString(R.string.special_code_confirm_success_detail), model.getSpecialCodeType()),
+        String.format(ResourceUtil.getString(R.string.special_code_confirm_success_detail), model.getUpdatedSpecialCodeType()),
         0,
         Toast.LENGTH_LONG
       );
 
-      model.clearSpecialCodeType();
+      model.clearUpdatedSpecialCodeType();
     }
 
-    if (StringUtil.isFull(model.getRecommendName())) {
+    if (StringUtil.isFull(model.getUpdatedRecommendName())) {
       showCustomToast(
         ResourceUtil.getString(R.string.recommend_special_code_confirm_success),
-        String.format(ResourceUtil.getString(R.string.recommend_confirm_success_detail), model.getRecommendName(), model.getIncreasedCoin()),
+        String.format(ResourceUtil.getString(R.string.recommend_confirm_success_detail), model.getUpdatedRecommendName(), model.getIncreasedCoin()),
         0,
         Toast.LENGTH_LONG
       );
 
-      model.clearRecommendName();
+      model.clearUpdatedRecommendName();
       model.clearIncreasedCoin();
     }
   }
@@ -234,7 +234,7 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
     // 스페셜 코드가 있으면 레이블 표시
     if (model.hasSpecialCodeRegistered()) {
       view.setSpecialCodeLabelVisible(true);
-      String label = model.getSpecialCodeType();
+      String label = model.getUpdatedSpecialCodeType();
       if (StringUtil.isEmpty(label)) {
         label = ResourceUtil.getString(R.string.special_code);
       }