[공통][Common] 리팩토링

app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -170,6 +170,12 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
     return api().getPopupInfo(bean);
   }
 
+  /**
+   * 날씨 정보
+   *
+   * @param bean
+   * @return
+   */
   @Override
   public Single<WeatherResultBean> getWeather(WeatherRequestBean bean) {
     return api().getWeather(bean);

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

@@ -47,7 +47,6 @@ public final class SuperModel implements IMemberStatusManager {
 
   private String deviceUuid;
   private String userId;
-  private String token;
   private String userName;
   private String userEmail;
   private boolean hasContentsLink;
@@ -63,11 +62,18 @@ public final class SuperModel implements IMemberStatusManager {
   /**
    * 초기화. SplashActivity 에서 호출된다.
    *
+   */
+  public void init() {
+    initialized = true;
+  }
+
+  /**
+   * 프리퍼런스 지정
+   *
    * @param preferences LifeplusPreferences
    */
-  public void init(LifeplusPreferences preferences) {
+  public void setPreferences(LifeplusPreferences preferences) {
     this.preferences = preferences;
-    initialized = true;
   }
 
   /**
@@ -220,7 +226,7 @@ public final class SuperModel implements IMemberStatusManager {
    * @return
    */
   public boolean isActiveMember() {
-    return /*StringUtil.isFull(getToken()) &&*/ StringUtil.isFull(getUserId()) && memberStatus == 1;
+    return StringUtil.isFull(getUserId()) && memberStatus == 1;
   }
 
 
@@ -286,6 +292,7 @@ public final class SuperModel implements IMemberStatusManager {
   public void setReviewCounted() {
     isReviewCounted = true;
   }
+
   /***********************************
    * IMemberStatusManager
    ***********************************/

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

@@ -26,7 +26,8 @@ public class SuperModelInit {
    * @param context ApplicationContext
    */
   public static void init(Context context) {
-    SuperModel.getInstance().init(new LifeplusPreferences(new BaseSharedPreferences(PreferenceManager.getDefaultSharedPreferences(context))));
+    SuperModel.getInstance().init();
+    SuperModel.getInstance().setPreferences(new LifeplusPreferences(new BaseSharedPreferences(PreferenceManager.getDefaultSharedPreferences(context))));
     SuperModel.getInstance().setDeviceId(AppUtil.getDeviceId(context));
   }
 }

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

@@ -66,6 +66,9 @@ import kr.co.zumo.app.lifeplus.view.screen.setting.SettingViewHolder;
  */
 public class MainModel extends Model {
 
+  private static final String NETWORK = "network";
+  private static final String GPS = "gps";
+
   private Disposable disposable;
   private Disposable disposablePromotion;
   private Disposable disposableWeather;
@@ -533,18 +536,28 @@ public class MainModel extends Model {
 
       @Override
       public void onStatusChanged(String s, int i, Bundle bundle) {
-        Log.w("APP# MainModel | onStatusChanged", "|" + s + ", bundle: " + bundle.toString());
+        Log.w("APP# MainModel | onStatusChanged", "|" + s);
       }
 
       @Override
       public void onProviderEnabled(String s) {
-        isNetworkEnabled = true;
+        if (NETWORK.equals(s)) {
+          isNetworkEnabled = true;
+        }
+        else if (GPS.equals(s)) {
+          isGPSEnabled = true;
+        }
         Log.w("APP# MainModel | onProviderEnabled", "|" + s);
       }
 
       @Override
       public void onProviderDisabled(String s) {
-        isNetworkEnabled = false;
+        if (NETWORK.equals(s)) {
+          isNetworkEnabled = false;
+        }
+        else if (GPS.equals(s)) {
+          isGPSEnabled = false;
+        }
         Log.w("APP# MainModel | onProviderDisabled", "|" + s);
       }
     };