Преглед изворни кода

[공통][Common] 앱 초기화는 SplashActivity, 앱 종료는 ExitCommand

hyodong.min пре 7 година
родитељ
комит
dce3ef7b1d

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

@@ -7,7 +7,7 @@ import android.content.Context;
 
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.model.SuperModelInit;
-import kr.co.zumo.app.lifeplus.util.AppUtil;
+import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
 
 /**
  * AppInitializer
@@ -21,13 +21,26 @@ import kr.co.zumo.app.lifeplus.util.AppUtil;
  */
 public class AppInitializer {
 
+  /**
+   * 앱 초기화
+   *
+   * @param context
+   */
   public void init(Context context) {
 
     if (SuperModel.getInstance().isInitialized() == false) {
 
       SuperModelInit.init(context);
 
-      SuperModel.getInstance().setDeviceId(AppUtil.getDeviceId(context));
     }
   }
+
+  /**
+   * 앱 종료 설정
+   *
+   */
+  public void dispose() {
+    SuperModel.getInstance().dispose();
+    ContentsFlagHelper.getInstance().dispose();
+  }
 }

+ 2 - 19
app/src/main/java/kr/co/zumo/app/lifeplus/application/App.java

@@ -8,8 +8,6 @@ import android.support.multidex.MultiDexApplication;
 import android.util.Log;
 
 import kr.co.zumo.app.BuildConfig;
-import kr.co.zumo.app.lifeplus.model.SuperModel;
-import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
 import kr.co.zumo.app.lifeplus.supervisor.TypefaceUtil;
 
 /**
@@ -40,11 +38,9 @@ public class App extends MultiDexApplication {
     super.onCreate();
     ourInstance = this;
 
-    /*
-      App init
+    /**
+     * font init
      */
-//    new AppInitializer().init(getContext());
-
     new TypefaceUtil().init(getContext());
 
     Log.w("APP# App | onCreate", "|" + "===============================================================================================");
@@ -62,17 +58,4 @@ public class App extends MultiDexApplication {
   public Context getContext() {
     return getApplicationContext();
   }
-
-  @Override
-  public void onTerminate() {
-    super.onTerminate();
-    SuperModel.getInstance().dispose();
-    ContentsFlagHelper.getInstance().dispose();
-
-    Log.w("APP# App | onCreate", "|" + "===============================================================================================");
-    Log.w("APP# App | onCreate", "| << appId: " + BuildConfig.APPLICATION_ID + ", buildType: " + BuildConfig.BUILD_TYPE +
-      ", flavor: " + BuildConfig.FLAVOR + ", versionCode: " + BuildConfig.VERSION_CODE + ", versionName: " + BuildConfig.VERSION_NAME + " >>");
-    Log.w("APP# App | onCreate", "|" + "<< -------------------------------------- terminated --------------------------------------- >>");
-    Log.w("APP# App | onCreate", "|" + "===============================================================================================");
-  }
 }

+ 4 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/SuperModelInit.java

@@ -10,6 +10,8 @@ import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
 
+import kr.co.zumo.app.lifeplus.util.AppUtil;
+
 /**
  * SuperModelInit
  * <pre>
@@ -38,5 +40,7 @@ public class SuperModelInit {
     Log.w("APP# SuperModelInit | init", "|" + " SCREEN W: " + width + ", H: " + height);
 
     SuperModel.getInstance().init(new LifeplusPreferences(new BaseSharedPreferences(PreferenceManager.getDefaultSharedPreferences(context))), width, height);
+
+    SuperModel.getInstance().setDeviceId(AppUtil.getDeviceId(context));
   }
 }

+ 4 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/command/ExitCommand.java

@@ -5,6 +5,7 @@ package kr.co.zumo.app.lifeplus.view.command;
 
 import android.app.Activity;
 
+import kr.co.zumo.app.lifeplus.activity.AppInitializer;
 import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.view.IView;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
@@ -31,7 +32,10 @@ public class ExitCommand extends Command<Model, IView, Presenter> {
 //      activity.finishAffinity();
 //    }
 
+    new AppInitializer().dispose();
+
     activity.finishAffinity();
+
   }
 
   @Override