Jelajahi Sumber

refractor 优化

RobinTan1024 4 tahun lalu
induk
melakukan
ef37fc6c01

+ 1 - 0
app/src/main/java/com/doverfuelingsolutions/issp/view/LoginActivity.kt

@@ -31,6 +31,7 @@ class LoginActivity : AppCompatActivity(),
 
         fun start(context: Context, extras: Bundle) {
             Intent(context, LoginActivity::class.java).let {
+                it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK)
                 it.putExtras(extras)
                 context.startActivity(it)
             }

+ 2 - 4
app/src/main/java/com/doverfuelingsolutions/issp/view/PreferenceActivity.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -119,10 +120,7 @@ class PreferenceActivity : AppCompatActivity(),
                 GlobalData.password.set("")
                 GlobalData.accessToken.set("")
                 GlobalData.accessTokenExpire.set(0L)
-                Intent(this, LoginActivity::class.java).let {
-                    it.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-                    startActivity(it)
-                }
+                LoginActivity.start(this, bundleOf(Pair(LoginActivity.autoLogin, false)))
             }
         }
     }