Merge branch 'develop' into new_presenter

* develop:
  [공통][New] 네트워크 연결 해제 (장치, 인터넷) 시 이벤트 처리

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityBase.java
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/NetworkDisconnectedFragmentPresenter.java

app/build.gradle

@@ -90,7 +90,11 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation('com.squareup.retrofit2:converter-gson:2.3.0')
+    {
+        exclude group: 'com.google.code.gson', module: 'gson'
+    }
+
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
 
     /*********************************

app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityBase.java

@@ -28,12 +28,17 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
 
   P presenter;
 
+  /***********************************
+   * Activity
+   ***********************************/
+
   @Override
   protected final void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
     onAfterCreate(savedInstanceState);
 
+    defineActionBar();
   }
 
   @Override
@@ -41,18 +46,9 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
     super.onDestroy();
   }
 
-  /**
-   * onCreate() 처리 후 호출된다
-   *
-   * @param savedInstanceState
-   */
-  abstract void onAfterCreate(Bundle savedInstanceState);
-
-  /**
-   * ActionBar 를 정의 해준다.
-   */
-  abstract void defineActionBar();
-
+  private boolean exitToBack() {
+    return presenter.onBackPressed();
+  }
   /**
    * Device back key
    */
@@ -82,10 +78,27 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
     return true;
   }
 
-  private boolean exitToBack() {
-    return presenter.onBackPressed();
-  }
 
+  /***********************************
+   * ActivityBase
+   ***********************************/
+
+  /**
+   * onCreate() 처리 후 호출된다
+   *
+   * @param savedInstanceState
+   */
+  abstract void onAfterCreate(Bundle savedInstanceState);
+
+  /**
+   * ActionBar 를 정의 해준다.
+   */
+  abstract void defineActionBar();
+
+
+  /***********************************
+   * IView
+   ***********************************/
   @Override
   public ActivityBase getActivityBase() {
     return this;

app/src/main/java/kr/co/zumo/app/lifeplus/network/InternetStatus.java

@@ -50,8 +50,8 @@ public class InternetStatus {
    * @return Observable with Boolean
    */
   public static Observable<Boolean> observe(final String host, final int port, final int intervalMs, final int timeoutMs) {
-    return Observable.interval(0, intervalMs, TimeUnit.MILLISECONDS,
-      Schedulers.io()).map(tick -> isConnected(new Socket(), StringUtil.removeProtocol(host), port, timeoutMs)).distinctUntilChanged();
+    return Observable.interval(0, intervalMs, TimeUnit.MILLISECONDS, Schedulers.io())
+      .map(tick -> isConnected(new Socket(), StringUtil.removeProtocol(host), port, timeoutMs)).distinctUntilChanged();
   }
 
   /**

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/FragmentBase.java

@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -41,14 +40,14 @@ public abstract class FragmentBase<T extends FragmentPresenter> extends Fragment
   public final void onAttach(Context context) {
     super.onAttach(context);
 
-    Log.i("APP# FragmentBase | onAttach", "|"  + this);
+//    Log.i("APP# FragmentBase | onAttach", "|"  + this);
   }
 
   @Override
   public final void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    Log.i("APP# FragmentBase | onCreate", "|"  + this);
+//    Log.i("APP# FragmentBase | onCreate", "|"  + this);
   }
 
   @Nullable
@@ -64,7 +63,7 @@ public abstract class FragmentBase<T extends FragmentPresenter> extends Fragment
 
     draw();
 
-    Log.i("APP# FragmentBase | onActivityCreated", "|"  + this);
+//    Log.i("APP# FragmentBase | onActivityCreated", "|"  + this);
   }
 
   @Override
@@ -73,7 +72,7 @@ public abstract class FragmentBase<T extends FragmentPresenter> extends Fragment
 
     start();
 
-    Log.i("APP# FragmentBase | onStart", "|"  + this);
+//    Log.i("APP# FragmentBase | onStart", "|"  + this);
   }
 
 //  @Override
@@ -92,14 +91,14 @@ public abstract class FragmentBase<T extends FragmentPresenter> extends Fragment
 
     stop();
 
-    Log.i("APP# FragmentBase | onStop", "|"  + this);
+//    Log.i("APP# FragmentBase | onStop", "|"  + this);
   }
 
   @Override
   public final void onDestroyView() {
     super.onDestroyView();
 
-    Log.i("APP# FragmentBase | onDestroyView", "|"  + this);
+//    Log.i("APP# FragmentBase | onDestroyView", "|"  + this);
   }
 
   @Override
@@ -108,14 +107,14 @@ public abstract class FragmentBase<T extends FragmentPresenter> extends Fragment
 
     presenter.dispose();
 
-    Log.i("APP# FragmentBase | onDestroy", "|"  + this);
+//    Log.i("APP# FragmentBase | onDestroy", "|"  + this);
   }
 
   @Override
   public final void onDetach() {
     super.onDetach();
 
-    Log.i("APP# FragmentBase | onDetach", "|"  + this);
+//    Log.i("APP# FragmentBase | onDetach", "|"  + this);
   }
 
   /***********************************

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/NetworkDisconnectedFragmentPresenter.java

@@ -87,7 +87,7 @@ public class NetworkDisconnectedFragmentPresenter extends FragmentPresenter<INet
 
   @Override
   public void onNetworkStatusChanged(boolean isConnected, int connectType) {
-    Log.w("APP# NetworkDisconnectedFragmentPresenter | onNetworkStatusChanged", "| isConnected: " + isConnected);
+    Log.w("APP# NetworkDisconnectedPresenter | onNetworkStatusChanged", this.getClass().getSimpleName() + " | isConnected: " + isConnected);
     if (true == isConnected) {
       exitTo(ScreenID.MAIN);
     }