[설정][New] 최신 API 적용 2

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIModule.java

@@ -119,6 +119,7 @@ public abstract class APIModule<T extends RequestBean, R extends LifeplusAPIBean
 
   public Disposable call(T requestBean, IAPIModuleListener<R> listener) {
     requestBean = mapBasicParameter(requestBean);
+    Log.d("APP# APIModule | call", "| <" + requestBean.getClass().getSimpleName() + ">");
     Log.d("APP# APIModule | call", "|" + APIModule.this.getClass().getSimpleName() + " -> " + requestBean.toPrettyJson());
     disposable = getAPI(requestBean)
       .subscribeOn(Schedulers.io())

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PolicyDialog.java

@@ -39,7 +39,7 @@ public class PolicyDialog extends TextDialog {
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.web_dialog, container, false);
+    return inflater.inflate(R.layout.policy_dialog, container, false);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/factory/BasicDialogFactory.java

@@ -14,6 +14,7 @@ import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
 import kr.co.zumo.app.lifeplus.view.dialog.CategoryFirstMainFilterDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.PinConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.PinUnlockDialog;
+import kr.co.zumo.app.lifeplus.view.dialog.PolicyDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.PromotionDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.WebDialog;
 
@@ -66,6 +67,9 @@ public class BasicDialogFactory implements IDialogFactory {
       case DialogID.MAIN_SECOND_FILTER:
         dialog = new CategorySecondMainFilterDialog();
         break;
+      case DialogID.POLICY:
+        dialog = new PolicyDialog();
+        break;
       default:
         throw new Error("Unsupported dialog.");
     }

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

@@ -136,9 +136,12 @@ public class SettingModel extends Model {
         SettingModelHelper.getInstance().setSettingMemberBean(resultBean.getData());
         settingMemberBean = SettingModelHelper.getInstance().getSettingMemberBean();
 
-        setPushEnabled(settingMemberBean.isAllowPush());
-        setPushMarketingEnabled(settingMemberBean.isAllowPushMarketing());
-        setLocationServiceEnabled(settingMemberBean.isAllowLocationService());
+        SuperModel.getInstance().setUserName(settingMemberBean.getUserName());
+        SuperModel.getInstance().setUserEmail(settingMemberBean.getEmail());
+
+        setPushEnabledInternal(settingMemberBean.isAllowPush());
+        setPushMarketingEnabledInternal(settingMemberBean.isAllowPushMarketing());
+        setLocationServiceEnabledInternal(settingMemberBean.isAllowLocationService());
 
         onResult(new Event.Builder(Event.RESULT).integer(Event.SETTING_LOAD).build());
       }
@@ -231,6 +234,10 @@ public class SettingModel extends Model {
   }
 
   public void setPushEnabled(boolean isEnabled) {
+    setPushEnabledInternal(isEnabled);
+  }
+
+  protected void setPushEnabledInternal(boolean isEnabled) {
     SuperModel.getInstance().getPreferences().setPushEnabled(isEnabled);
   }
 
@@ -244,6 +251,10 @@ public class SettingModel extends Model {
   }
 
   public void setPushMarketingEnabled(boolean isEnabled) {
+    setPushMarketingEnabledInternal(isEnabled);
+  }
+
+  protected void setPushMarketingEnabledInternal(boolean isEnabled) {
     SuperModel.getInstance().getPreferences().setPushMarketingEnabled(isEnabled);
   }
 
@@ -257,6 +268,10 @@ public class SettingModel extends Model {
   }
 
   public void setLocationServiceEnabled(boolean isEnabled) {
+    setLocationServiceEnabledInternal(isEnabled);
+  }
+
+  protected void setLocationServiceEnabledInternal(boolean isEnabled) {
     SuperModel.getInstance().getPreferences().setLocationServiceEnabled(isEnabled);
   }
 }