|
@@ -8,6 +8,7 @@ import androidx.appcompat.widget.Toolbar;
|
|
|
|
|
|
|
|
import com.miekir.eden.R;
|
|
import com.miekir.eden.R;
|
|
|
import com.miekir.eden.ui.TabActivity;
|
|
import com.miekir.eden.ui.TabActivity;
|
|
|
|
|
+import com.miekir.eden.ui.mine.login.LoginActivity;
|
|
|
import com.miekir.eden.ui.welcome.WelcomeActivity;
|
|
import com.miekir.eden.ui.welcome.WelcomeActivity;
|
|
|
import com.miekir.mvp.view.BaseMVPActivity;
|
|
import com.miekir.mvp.view.BaseMVPActivity;
|
|
|
|
|
|
|
@@ -44,14 +45,14 @@ public abstract class BaseBeiActivity extends BaseMVPActivity {
|
|
|
@Override
|
|
@Override
|
|
|
public void finish() {
|
|
public void finish() {
|
|
|
super.finish();
|
|
super.finish();
|
|
|
- if (!(this instanceof WelcomeActivity) && !(this instanceof TabActivity)) {
|
|
|
|
|
|
|
+ if (!(this instanceof WelcomeActivity) && !(this instanceof TabActivity) && !(this instanceof LoginActivity)) {
|
|
|
overridePendingTransition(R.anim.activity_stable, R.anim.activity_left_to_right);
|
|
overridePendingTransition(R.anim.activity_stable, R.anim.activity_left_to_right);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
|
|
- if (!(this instanceof WelcomeActivity) && !(this instanceof TabActivity)) {
|
|
|
|
|
|
|
+ if (!(this instanceof WelcomeActivity) && !(this instanceof TabActivity) && !(this instanceof LoginActivity)) {
|
|
|
overridePendingTransition(R.anim.activity_right_to_left, R.anim.activity_stable);
|
|
overridePendingTransition(R.anim.activity_right_to_left, R.anim.activity_stable);
|
|
|
}
|
|
}
|
|
|
|
|
|