Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/dev/java/kr/co/zumo/app/lifeplus/view/screen/splash/SplashFragment.java

@@ -8,7 +8,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.constraint.ConstraintLayout;
 import android.support.constraint.ConstraintSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,13 +28,8 @@ import kr.co.zumo.app.lifeplus.activity.AppInitializer;
 import kr.co.zumo.app.lifeplus.config.DebugConfig;
 import kr.co.zumo.app.lifeplus.config.NetworkConfigProvider;
 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.APIModuleListener;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
-import kr.co.zumo.app.lifeplus.zumo.bean.api.MemberInfoByUserNoRequestBean;
-import kr.co.zumo.app.lifeplus.zumo.bean.api.MemberInfoResultBean;
-import kr.co.zumo.app.lifeplus.zumo.model.module.APIMemberInfoByUserNoModule;
 
 /**
  * SplashFragment
@@ -191,22 +185,22 @@ public class SplashFragment extends SplashDebugFragment {
     AppInitializer.logout();
   }
 
-  @Deprecated
-  private void login() {
-    new APIMemberInfoByUserNoModule().call(new MemberInfoByUserNoRequestBean(), new APIModuleListener<MemberInfoResultBean>(presenter) {
-        @Override
-        public void onApiSuccess(MemberInfoResultBean resultBean) {
-          // 정상;
-          renderDebug();
-        }
-
-        @Override
-        public void onApiError(String errorMessage, APIError error) {
-          Log.e("APP#  MainFragment | onApiError", "|" + errorMessage);
-        }
-      }
-    );
-  }
+//  @Deprecated
+//  private void login() {
+//    new APIMemberInfoByUserNoModule().call(new MemberInfoByUserNoRequestBean(), new APIModuleListener<MemberInfoResultBean>(presenter) {
+//        @Override
+//        public void onApiSuccess(MemberInfoResultBean resultBean) {
+//          // 정상;
+//          renderDebug();
+//        }
+//
+//        @Override
+//        public void onApiError(String errorMessage, APIError error) {
+//          Log.e("APP#  MainFragment | onApiError", "|" + errorMessage);
+//        }
+//      }
+//    );
+//  }
 
   @Deprecated
   private void renderDebug() {

app/src/main/java/kr/co/zumo/app/lifeplus/InstallReferrerReceiver.java

@@ -31,11 +31,9 @@ public class InstallReferrerReceiver extends BroadcastReceiver {
                 if (params != null) {
                     for (String param : params) {
                         String[] pair = param.split("=");
-                        if (pair != null && pair.length > 1) {
-                            if (pair[0].equalsIgnoreCase("click_key")) {
-                                String clickKey = pair[1];
-                                //TODO: API 추가 개발 후 반영 예정
-                            }
+                        if (pair != null && pair.length > 1 && pair[0].equalsIgnoreCase("click_key")) {
+                            String clickKey = pair[1];
+                            //TODO: API 추가 개발 후 반영 예정
                         }
                     }
                 }

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

@@ -2,7 +2,6 @@ package kr.co.zumo.app.lifeplus.helper;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.drawable.StateListDrawable;
 import android.support.annotation.IntRange;
@@ -44,20 +43,22 @@ public class ActionBarHelper extends Helper {
 
   private static final int APP_BAR_LAYOUT_SCROLL_PARAM = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS; // | AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP;
 
+
+
   private ActionBar actionBar;
-  @SuppressLint("StaticFieldLeak")
+
   private Activity activity;
-  @SuppressLint("StaticFieldLeak")
+
   private AppBarLayout appBarLayout;
-  @SuppressLint("StaticFieldLeak")
+
   private ConstraintLayout container;
-  @SuppressLint("StaticFieldLeak")
+
   private Toolbar toolbar;
-  @SuppressLint("StaticFieldLeak")
+
   private ProgressBar progressBar;
-  @SuppressLint("StaticFieldLeak")
+
   private ConstraintLayout layoutCategoryTab;
-  @SuppressLint("StaticFieldLeak")
+
   private ConstraintLayout categoryMainTab;
 
 

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

@@ -25,7 +25,7 @@ public class LifeplusPreferences {
   private final static String PERMISSION_INFO_DONE = "permission_info_done";
   private final static String DEVICE_UUID = "device_uuid";
   private final static String ENCRYPTED_PIN = "encrypted_pin";
-  private final static String PUSH_EVENT_ENABLED = "push_marketing_enabled";
+ // private final static String PUSH_EVENT_ENABLED = "push_marketing_enabled";
   private final static String PUSH_EVENT_SERVICE_ENABLED = "push_enabled";
   private final static String POLICY_EVENT_ENABLED = "push_marketing_enabled";
   private final static String LOCATION_SERVICE_ENABLED = "location_service_enabled";

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

@@ -462,7 +462,10 @@ public abstract class Model extends ViewModel implements ILifeCycle, IHelperProv
       disposableBookMarkList.dispose();
       disposableBookMarkList = null;
     }
-
+    if (null != disposableNoti) {
+      disposableNoti.dispose();
+      disposableNoti= null;
+    }
     stopInternal();
   }
 

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

@@ -97,7 +97,7 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
     textViewEventDate.setText(ResourceUtil.getString(R.string.event_period, EventBean.getTermString(bean)));
     textViewWinnerDate.setText(ResourceUtil.getString(R.string.event_announce, winnerDate));
 
-    // TODO: 당첨자 발표 내용 API 보완 필요함 
+    // TODO: 당첨자 발표 내용 API 보완 필요함
     textViewAnnouncementNotice.setText(bean.getDescription());
 
     int emailId = R.id.text_view_email;

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

@@ -24,7 +24,7 @@ class EventQuestionNoticeView extends RecyclerView.ViewHolder {
 
   //private TextView textViewNoticeTitle;
   private LinearLayout layoutContainer;
-  private TextView textViewContents;
+
 
   public EventQuestionNoticeView(View itemView) {
     super(itemView);
@@ -33,6 +33,8 @@ class EventQuestionNoticeView extends RecyclerView.ViewHolder {
   }
 
   public void draw(String notice) {
+    TextView textViewContents;
+
     String[] contentsArray = notice.split("\n");
     LayoutInflater inflater = (LayoutInflater) itemView.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     for (int i = 0; i < contentsArray.length; ++i) {

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

@@ -58,7 +58,7 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
   private DoubleChecker doubleChecker;
   private DoubleChecker doubleCheckerPopup;
   private DoubleChecker doubleCheckerWeather;
-  private Disposable disposableNewbie;
+  //private Disposable disposableNewbie;
   private boolean isRequestingLocationPermissions = false;
 
   public MainPresenter(MainModel model, IMainView view) {