Commit b515ae9d authored by yinjiacheng's avatar yinjiacheng

update 登录页面跳转特殊处理,未登录状态下从开屏页跳转直接startActivity,退出登录、切换登录使用XPage

parent 7b507236
...@@ -97,8 +97,7 @@ class NewsContentApplication : YdBaseApplication() { ...@@ -97,8 +97,7 @@ class NewsContentApplication : YdBaseApplication() {
intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap) intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
} }
intent.setClass(context, LoginLifeCircleActivity::class.java) intent.setClass(context, LoginLifeCircleActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
// intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent) context.startActivity(intent)
} }
}), }),
......
package com.yidian.shenghuoquan.newscontent.ui package com.yidian.shenghuoquan.newscontent.ui
import android.content.Intent
import android.os.Bundle import android.os.Bundle
import com.orhanobut.hawk.Hawk import com.orhanobut.hawk.Hawk
import com.yidian.common.HawkConfig import com.yidian.common.HawkConfig
...@@ -39,8 +40,8 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC ...@@ -39,8 +40,8 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
ApiService.getLifeAccountList(this) ApiService.getLifeAccountList(this)
} else { } else {
// 未登录 跳转登录 // 未登录 跳转登录
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null) // 此处没有使用XPage打开页面 原因:不能设置flag
XPageManager.pop(null) startActivity(Intent(this, LoginLifeCircleActivity::class.java))
finish() finish()
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment