androidcode
/
yijianlianUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

需求: 

重启逻辑更改
This commit is contained in:
level 2025-07-03 12:11:56 +08:00
parent f307753dd6
commit cddef05978
4 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/yingmao/clash/act/MemberRechargeActivity.kt
View File

@ -326,9 +326,26 @@ class MemberRechargeActivity : BaseActivity() {
dialogDoMainChoose?.setOnListItemListener(object : dialogDoMainChoose?.setOnListItemListener(object :
DialogDoMainChoose.OnListItemListener { DialogDoMainChoose.OnListItemListener {
override fun listItemClick() { override fun listItemClick() {
val intent=Intent(CommonUtils.getApp(), SplashActivity::class.java) MainApplication.restartApp(this@MemberRechargeActivity, object :
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK) MainApplication.OnRestartButtonListener {
startActivity(intent) override fun enterButton() {
}
override fun cancelButton() {
val username = MMKV.defaultMMKV()
.decodeString(
BZYConstants.MMKV_KEY_REMEMBER_USERNAME,
""
)!!
val phToken = MMKV.defaultMMKV()
.decodeString(BZYConstants.MMKV_KEY_PH_TOKEN, "")!!
val userId = MMKV.defaultMMKV()
.decodeString(BZYConstants.MMKV_KEY_USER_ID)!!
viewModel.getPhRechargeInfo(username, phToken, userId)
dialogDoMainChoose?.dismiss()
}
})
} }
}) })

13
app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
View File

@ -376,9 +376,16 @@ class NewMainActivity : BaseActivity() {
DialogDoMainChoose.OnListItemListener { DialogDoMainChoose.OnListItemListener {
override fun listItemClick() { override fun listItemClick() {
RxToast.info(getString(R.string.StorageSuccessful)) RxToast.info(getString(R.string.StorageSuccessful))
val intent=Intent(CommonUtils.getApp(), SplashActivity::class.java) MainApplication.restartApp(this@NewMainActivity,object:MainApplication.OnRestartButtonListener{
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(intent) override fun enterButton() {
}
override fun cancelButton() {
dialogDoMainChoose?.dismiss()
}
})
} }
}) })

23
app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
View File

@ -765,19 +765,16 @@ class SettingActivity : BaseActivity() {
dialogDoMainChoose?.setOnTryButtonListener(object : dialogDoMainChoose?.setOnTryButtonListener(object :
DialogDoMainChoose.OnTryButtonListener { DialogDoMainChoose.OnTryButtonListener {
override fun tryButton() { override fun tryButton() {
// MainApplication.restartApp(this@SettingActivity,object:MainApplication.OnRestartButtonListener{ MainApplication.restartApp(this@SettingActivity,object:MainApplication.OnRestartButtonListener{
//
// override fun enterButton() { override fun enterButton() {
//
// } }
//
// override fun cancelButton() { override fun cancelButton() {
// dialogDoMainChoose?.dismiss() dialogDoMainChoose?.dismiss()
// } }
// }) })
val intent=Intent(CommonUtils.getApp(), SplashActivity::class.java)
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(intent)
} }
override fun cancel() { override fun cancel() {

2
app/src/main/java/com/yingmao/clash/app/MainApplication.kt
View File

@ -77,7 +77,7 @@ class MainApplication : Application() {
MainScope().launch { MainScope().launch {
delay(500) delay(500)
ProcessPhoenix.triggerRebirth(mApp) ProcessPhoenix.triggerRebirth(activity)
} }
listener.enterButton() listener.enterButton()
dialogDoMainChoose.dismiss() dialogDoMainChoose.dismiss()