Przeglądaj źródła

[공통][Bug] 디버그 모드 일부 제거 - 네트워크 감시

hyodong.min 7 lat temu
rodzic
commit
df76a3af01

+ 3 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityBase.java

@@ -20,7 +20,6 @@ import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.network.NetworkReceiver;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
 import kr.co.zumo.app.lifeplus.supervisor.DialogHelper;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
@@ -205,9 +204,9 @@ public abstract class ActivityBase<P extends Presenter> extends AppCompatActivit
    * 변동이 있을 때 presenter 로 알려준다.
    */
   protected void watchNetwork() {
-    if (AppUtil.isDebug()) {
-      return;
-    }
+//    if (AppUtil.isDebug()) {
+//      return;
+//    }
 
     Log.w("APP# ActivityBase | watchNetwork", "| " + this.getClass().getSimpleName() + " - WATCHING............");
 

+ 12 - 13
app/src/main/java/kr/co/zumo/app/lifeplus/activity/SplashActivity.java

@@ -16,7 +16,6 @@ import kr.co.zumo.app.lifeplus.application.App;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
 import kr.co.zumo.app.lifeplus.supervisor.DialogHelper;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.PermissionUtil;
 
 /**
@@ -43,19 +42,19 @@ public class SplashActivity extends AppCompatActivity {
 
     ActivityStarter starter = new ActivityStarter(this);
 
-    if (AppUtil.isRelease()) {
-      disposable.add(NetworkWatcher.check(context)
-        .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
-        .subscribe(isConnected -> {
-          disposable.dispose();
+//    if (AppUtil.isDebug()) {
+//      starter.launch(true);
+//      return;
+//    }
 
-          starter.launch(isConnected);
-        }, Throwable::printStackTrace)
-      );
-    }
-    else {
-      starter.launch(true);
-    }
+    disposable.add(NetworkWatcher.check(context)
+      .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+      .subscribe(isConnected -> {
+        disposable.dispose();
+
+        starter.launch(isConnected);
+      }, Throwable::printStackTrace)
+    );
   }
 
   @Override

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/MobileAuthorizationPresenter.java

@@ -713,7 +713,7 @@ public class MobileAuthorizationPresenter {
       result = true;
     }
 
-    view.setEnabledRequestConfirmButton(authorizationNumber.length() > 0);
+    view.setEnabledRequestConfirmButton(result);
 
     return result;
   }