[공통][Bug] 일부 코드 수정

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

@@ -11,11 +11,11 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import kr.co.zumo.app.lifeplus.ILifeCycle;
 import kr.co.zumo.app.lifeplus.application.App;
+import kr.co.zumo.app.lifeplus.network.INetworkReceiverListener;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.factory.FragmentFactory;
-import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
 /**
  * Model
@@ -32,7 +32,7 @@ public abstract class Model extends ViewModel implements ILifeCycle {
 
   private IModelResult listener;
   private Disposable networkDisposable;
-  protected Presenter presenter;
+  protected INetworkReceiverListener networkListener;
 
   public Model() {
     Log.w("APP# Model | Model", "| model: >>>>>>>>>>>> " + this.getClass().getSimpleName());
@@ -53,13 +53,13 @@ public abstract class Model extends ViewModel implements ILifeCycle {
         .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
         .subscribe(isConnectedAll -> {
           Log.i("APP# Model | watchNetwork", "|" + "isConnectedAll: +++++++++" + isConnectedAll);
-          if (null != presenter) {
-            presenter.onChangedConnection(isConnectedAll, 0);
+          if (null != networkListener) {
+            networkListener.onChangedConnection(isConnectedAll, 0);
           }
         }, e -> {
           Log.i("APP# Model | watchNetwork", "|" + "isConnectedAll: ++++++++++" + "error ");
-          if (null != presenter) {
-            presenter.onChangedConnection(false, 0);
+          if (null != networkListener) {
+            networkListener.onChangedConnection(false, 0);
           }
         });
   }
@@ -137,6 +137,14 @@ public abstract class Model extends ViewModel implements ILifeCycle {
     SuperModel.getInstance().setFragmentFactory(factory);
   }
 
+  /**
+   * 네트워크 상태를 체크할 리스너 등록
+   *
+   * @param networkListener
+   */
+  public void setNetworkListener(INetworkReceiverListener networkListener) {
+    this.networkListener = networkListener;
+  }
   /***********************************
    * ILifeCycle
    ***********************************/

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

@@ -51,7 +51,7 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
     this.view = view;
 
     this.model.setListener(this);
-
+    this.model.setNetworkListener(this);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/pin/reset/PinResetAuthFragment.java

@@ -68,6 +68,7 @@ public class PinResetAuthFragment extends FragmentBase<PinResetAuthPresenter> im
       .back(actionBar -> presenter.onClickBack(actionBar));
 
     if(AppUtil.isSandbox()) {
+      // fixme for test
       builder.textButton(R.string.tutorial_bottom_next, actionBar -> {
         presenter.onResult(new Event.Builder(Event.SUCCESS).integer(Event.MEMBER_ALREADY_MEMBER).build());
       });

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/common/SettingMemberQuitInfoModel.java

@@ -71,17 +71,17 @@ public class SettingMemberQuitInfoModel extends Model {
 
         SettingModelHelper.getInstance().setCurrentCoin(coinBean.getCoin());
 
-        presenter.onResult(new Event.Builder(Event.RESULT).build());
+        onResult(new Event.Builder(Event.RESULT).build());
       }
 
       @Override
       public void onApiReason(CoinResultBean resultBean) {
-        presenter.onResult(new Event.Builder(Event.ERROR).string(resultBean.getReturnMessage()).build());
+        onResult(new Event.Builder(Event.ERROR).string(resultBean.getReturnMessage()).build());
       }
 
       @Override
       public void onApiError(String errorMessage) {
-        presenter.onResult(new Event.Builder(Event.ERROR).string(errorMessage).build());
+        onResult(new Event.Builder(Event.ERROR).string(errorMessage).build());
 
       }
     });

app/src/main/res/layout/container_dialog.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <FrameLayout
+    android:id="@+id/container_navigation_bar"
+    android:layout_width="match_parent"
+    android:background="@color/CFFFFFF"
+    android:layout_height="@dimen/action_bar_height">
+
+  </FrameLayout>
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  </android.support.constraint.ConstraintLayout>
+</LinearLayout>