Browse Source

[공통][Bug] 이머전시 종료 후 재 시작 안되는 버그 수정
- 스플래시에서 머물러 있었음

hyodong.min 6 years ago
parent
commit
cc1c3ac16f

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

@@ -266,9 +266,10 @@ public abstract class ActivityBase extends AppCompatActivity implements IHelperP
 
     if (allowCountActivity()) {
       App.getInstance().removeActivityCount();
-      if (App.getInstance().isDisposable()) {
-        AppInitializer.dispose();
-      }
+    }
+
+    if (App.getInstance().isDisposable()) {
+      AppInitializer.dispose();
     }
   }
 

+ 2 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/activity/AppInitializer.java

@@ -12,6 +12,7 @@ import kr.co.zumo.app.lifeplus.helper.EventEntryHelper;
 import kr.co.zumo.app.lifeplus.helper.FirebaseHelper;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
+import kr.co.zumo.app.lifeplus.model.module.APIModuleHelper;
 import kr.co.zumo.app.lifeplus.push.PushMessageBroker;
 import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryResultHelper;
@@ -79,6 +80,7 @@ public class AppInitializer {
     EventEntryHelper.getInstance().dispose();
     AppShieldHelper.getInstance().dispose();
     ContentsLogManager.getInstance().dispose();
+    APIModuleHelper.dispose();
 
     ActivityDeliveryHelper.getInstance().dispose();
     ActivityDeliveryResultHelper.getInstance().dispose();

+ 8 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIModuleHelper.java

@@ -60,6 +60,14 @@ public class APIModuleHelper {
     return isDispatched;
   }
 
+  /**
+   * dispose
+   */
+  public static void dispose() {
+    isDispatched = false;
+    emergencyHandler = null;
+  }
+
   /**
    * emergency event 송출
    *