[공통][Bug] 불필요 파일 제거 : 네트워크 연결 에러 관련

app/src/main/AndroidManifest.xml

@@ -62,12 +62,6 @@
       android:windowSoftInputMode="adjustResize">
     </activity>
 
-    <activity
-      android:name=".lifeplus.activity.NetworkErrorActivity"
-      android:screenOrientation="portrait"
-      android:windowSoftInputMode="adjustResize">
-    </activity>
-
     <activity
       android:name=".lifeplus.activity.ContentsOverviewActivity"
       android:screenOrientation="portrait"

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

@@ -1,40 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.activity;
-
-import android.content.Intent;
-
-import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-
-/**
- * NetworkErrorActivity
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 9. 5.]   [최초 작성]
- * @since 2018. 9. 5.
- */
-public class NetworkErrorActivity extends ActivityBase {
-
-  @Override
-  protected void renderScreen() {
-    // 첫 화면 표시
-    launchScreen(ScreenID.NETWORK_ERROR);
-  }
-
-  @Override
-  protected void onAfterNewIntent(Intent intent) {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-}
-
-

app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/screen/ActivityScreen.java

@@ -11,7 +11,6 @@ import kr.co.zumo.app.lifeplus.activity.CategoryActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsActivity;
 import kr.co.zumo.app.lifeplus.activity.ContentsOverviewActivity;
 import kr.co.zumo.app.lifeplus.activity.MenuActivity;
-import kr.co.zumo.app.lifeplus.activity.NetworkErrorActivity;
 import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
 import kr.co.zumo.app.lifeplus.bean.ContentsDeliveryBean;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
@@ -82,9 +81,6 @@ public class ActivityScreen extends Screen {
           deliveryHelper.clearPackaging();
         }
 
-        break;
-      case ScreenID.NETWORK_ERROR:
-        intent = new Intent(context, NetworkErrorActivity.class);
         break;
       default:
         Log.w("APP# ActivityScreen | change", "|" + "activity id bad...");

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

@@ -1,70 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view.screen.error;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
-import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
-
-/**
- * NetworkErrorFragment
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 10. 15.]   [최초 작성]
- * @since 2018. 10. 15.
- */
-public class NetworkErrorFragment extends FragmentBase<NetworkErrorPresenter> implements INetworkErrorView {
-  @Nullable
-  @Override
-  protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_network_error, container, false);
-  }
-
-  @Override
-  protected void onAfterActivityCreated(Bundle savedInstanceState) {
-
-    View buttonRetry = findViewById(R.id.button_confirm);
-    buttonRetry.setOnClickListener(v -> {
-      presenter.onEvent(new Event.Builder(Event.RETRY).build());
-    });
-
-  }
-
-  @Override
-  protected void defineActionBar(ActionBarHelper actionBarHelper) {
-    actionBarHelper.begin().title(R.string.network_disconnected).hide();
-  }
-
-  @Override
-  protected NetworkErrorPresenter definePresenter() {
-    return new NetworkErrorPresenter(getModel(BlankModel.class), this);
-  }
-
-  @Override
-  protected void onAfterDestroyView() {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-  @Override
-  protected boolean isSkipScreenWhenBack() {
-    return true;
-  }
-}

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

@@ -1,134 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view.screen.error;
-
-import android.util.Log;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import kr.co.zumo.app.lifeplus.application.App;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
-import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
-import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.command.ExitCommand;
-import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
-
-/**
- * NetworkErrorPresenter
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 9. 21.]   [최초 작성]
- * @since 2018. 9. 21.
- */
-public class NetworkErrorPresenter extends Presenter<BlankModel, INetworkErrorView> {
-
-  protected Disposable disposable;
-
-  public NetworkErrorPresenter(BlankModel model, INetworkErrorView view) {
-    super(model, view);
-  }
-
-  @Override
-  protected void startInternal() {
-
-  }
-
-  @Override
-  protected void stopInternal() {
-
-  }
-
-  @Override
-  protected void resumeInternal() {
-
-  }
-
-  @Override
-  protected void pauseInternal() {
-
-  }
-
-  @Override
-  protected void destroyViewInternal() {
-  }
-
-  @Override
-  protected void createViewInternal() {
-  }
-  @Override
-  protected void destroyInternal() {
-    if (null != disposable) {
-      disposable.dispose();
-      disposable = null;
-    }
-  }
-
-  @Override
-  public boolean onBackPressed() {
-    onCommand(new ExitCommand());
-    return true;
-  }
-
-  @Override
-  protected void onEventInternal(Event event) {
-    switch (event.getEventId()) {
-      case Event.RETRY:
-        retry();
-        break;
-      default:
-        break;
-    }
-  }
-
-  private void retry() {
-    /**
-     * 네트워크 연결 다시 시도
-     * - 연결됐다면 메인으로 이동
-     */
-    disposable = new NetworkWatcher().check(App.getInstance().getContext())
-      .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
-      .subscribe(isConnected -> {
-        Log.i("APP# NetworkErrorPresenter | checkNetworkConnection", "| isConnected: " + isConnected);
-        if (isConnected) {
-          next();
-        }
-        else {
-          // 그냥 그대로 있음;
-        }
-      }, Throwable::printStackTrace);
-  }
-
-  protected void next() {
-
-    // 사용 중 에러로 진입 할 경우
-    back(ScreenID.MAIN);
-  }
-
-  /***********************************
-   * listener
-   ***********************************/
-  @Override
-  public void onChangedConnection(boolean isConnected, int type) {
-    Log.i("APP# NetworkErrorPresenter | onChangedConnection", "| " + this.getClass().getSimpleName() + ", isConnected:" + isConnected);
-
-    if (true == isConnected) {
-      next();
-    }
-  }
-
-  @Override
-  public void onResult(Event event) {
-
-  }
-
-  @Override
-  public void onScreenReady() {
-
-  }
-}

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

@@ -16,7 +16,6 @@ import kr.co.zumo.app.lifeplus.view.screen.category.type5.FifthCategoryMainFragm
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsFragment;
 import kr.co.zumo.app.lifeplus.view.screen.contents.ContentsOverviewFragment;
 import kr.co.zumo.app.lifeplus.view.screen.couponmall.CouponMallFragment;
-import kr.co.zumo.app.lifeplus.view.screen.error.NetworkErrorFragment;
 import kr.co.zumo.app.lifeplus.view.screen.error.NetworkErrorStartingFragment;
 import kr.co.zumo.app.lifeplus.view.screen.event.EventFragment;
 import kr.co.zumo.app.lifeplus.view.screen.faq.FAQFragment;
@@ -148,9 +147,6 @@ public class BasicFragmentFactory extends FragmentFactory {
         break;
 
       // error
-      case ScreenID.NETWORK_ERROR:
-        fragment = new NetworkErrorFragment();
-        break;
       case ScreenID.NETWORK_ERROR_STARTING:
         fragment = new NetworkErrorStartingFragment();
         break;