- 4.0.6(176) 배포 완료

- 디바이스 기준으로 서버에 업데이트 로직 수정

app/build.gradle

@@ -38,8 +38,8 @@ android {
         applicationId "kr.co.zumo.app"
         minSdkVersion 19    // 4.4
         targetSdkVersion 27
-        versionCode 175
-        versionName "4.0.5"
+        versionCode 176
+        versionName "4.0.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/kr/co/zumo/app/lifeplus/helper/MemberInfoHelper.java

@@ -112,7 +112,7 @@ public class MemberInfoHelper {
               }
 
               if (APIData.isTrue(resultBean.getData().getPushRecvYn()) != isPushEventAndService()) {
-                setPushEventAndService(isPushEventAndService());
+                setPushEventAndService(isPushEventAndService(), resultBean.getData().getPushMktgReyn());
               }
             }
             listener.onApiSuccess(resultBean);
@@ -194,21 +194,22 @@ public class MemberInfoHelper {
     return SuperModel.getInstance().getPreferences().isPushEventAndServiceEnabled();
   }
 
-  public void setPushEventAndService(boolean isEnabled) {
+  public void setPushEventAndService(boolean isEnabled, String marketing) {
 
     /**
      * push event & service 는 "pushRecvYn" 필드 이용
      */
     MemberPushAgreeRequestBean bean = getPushBean(APIData.valueOf(isEnabled));
+    bean.setPushMarketingEnabled(marketing);
 
     new APIMemberPushUpdateModule().call(bean, new APIModuleListener<LifeplusAPIBean>() {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
-        if (isEnabled) {
-          FirebaseMessagingHelper.getInstance().subscribeToTopic();
-        } else {
-          FirebaseMessagingHelper.getInstance().unSubscribeToTopic();
-        }
+//        if (isEnabled) {
+//          FirebaseMessagingHelper.getInstance().subscribeToTopic();
+//        } else {
+//          FirebaseMessagingHelper.getInstance().unSubscribeToTopic();
+//        }
       }
 
       @Override