|
|
@@ -54,10 +54,11 @@ public abstract class ActivityBase extends AppCompatActivity {
|
|
|
public static final int SLIDE_TYPE_ACTIVITY = 0;
|
|
|
public static final int SLIDE_TYPE_HOME = 1;
|
|
|
public static final int SLIDE_TYPE_DIALOG = 2;
|
|
|
+ public static final int SLIDE_TYPE_NONE = 3;
|
|
|
|
|
|
@Retention(RetentionPolicy.SOURCE)
|
|
|
@IntDef({
|
|
|
- SLIDE_TYPE_ACTIVITY, SLIDE_TYPE_DIALOG, SLIDE_TYPE_HOME
|
|
|
+ SLIDE_TYPE_ACTIVITY, SLIDE_TYPE_DIALOG, SLIDE_TYPE_HOME, SLIDE_TYPE_NONE
|
|
|
})
|
|
|
public @interface SlideType {}
|
|
|
|
|
|
@@ -155,6 +156,15 @@ public abstract class ActivityBase extends AppCompatActivity {
|
|
|
Log.w("APP# ActivityBase | onRestoreInstanceState", "| >>>>>> " + this.getClass().getSimpleName() + " HC: " + this.hashCode());
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ protected final void onSaveInstanceState(Bundle outState) {
|
|
|
+ /**
|
|
|
+ * crash 후 앱 복원을 막기 위해서
|
|
|
+ */
|
|
|
+ outState = new Bundle();
|
|
|
+ super.onSaveInstanceState(outState);
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
protected final void onRestart() {
|
|
|
Log.w("APP# ActivityBase | onRestart", "| >>>> " + this.getClass().getSimpleName() + " HC: " + this.hashCode());
|
|
|
@@ -198,7 +208,7 @@ public abstract class ActivityBase extends AppCompatActivity {
|
|
|
|
|
|
if (allowCountActivity()) {
|
|
|
App.getInstance().removeActivityCount();
|
|
|
- if (App.getInstance().isFinished()) {
|
|
|
+ if (App.getInstance().isDisposable()) {
|
|
|
new AppInitializer().dispose(this);
|
|
|
}
|
|
|
}
|
|
|
@@ -208,6 +218,9 @@ public abstract class ActivityBase extends AppCompatActivity {
|
|
|
intent.putExtra(SLIDE_TYPE, type);
|
|
|
super.startActivity(intent);
|
|
|
switch (type) {
|
|
|
+ case SLIDE_TYPE_NONE:
|
|
|
+ overridePendingTransition(R.anim.none, R.anim.none);
|
|
|
+ break;
|
|
|
case SLIDE_TYPE_HOME:
|
|
|
overridePendingTransition(R.anim.activity_scale_in, R.anim.activity_scale_out);
|
|
|
break;
|
|
|
@@ -234,6 +247,9 @@ public abstract class ActivityBase extends AppCompatActivity {
|
|
|
switch (slideType) {
|
|
|
case SLIDE_TYPE_HOME:
|
|
|
break;
|
|
|
+ case SLIDE_TYPE_NONE:
|
|
|
+ overridePendingTransition(R.anim.none, R.anim.none);
|
|
|
+ break;
|
|
|
case SLIDE_TYPE_DIALOG:
|
|
|
overridePendingTransition(R.anim.none, R.anim.activity_slide_down);
|
|
|
break;
|