Commit 1d1167fa authored by wanglei's avatar wanglei

...跳转

parent e7fb98e1
...@@ -74,13 +74,15 @@ abstract class BaseActivity<VB : ViewBinding>( ...@@ -74,13 +74,15 @@ abstract class BaseActivity<VB : ViewBinding>(
fun finishToMainTop() { fun finishToMainTop() {
val intent = Intent(this, MainActivity::class.java) val intent = Intent(this, MainActivity::class.java)
intent.putExtra("where", "finishToMainTop") intent.putExtra("where", "finishToMainTop")
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(intent) startActivity(intent)
finish()
} }
var dialog: Dialog? = null var dialog: Dialog? = null
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
LogEx.logDebug(TAG, "lifecycle $tagNo onDestroy")
ActivityManagerUtils.getInstance().removeActivity(this) ActivityManagerUtils.getInstance().removeActivity(this)
if (dialog != null) { if (dialog != null) {
dialog?.dismiss() dialog?.dismiss()
......
...@@ -57,7 +57,7 @@ object MyNotificationManager { ...@@ -57,7 +57,7 @@ object MyNotificationManager {
val next = actionIdList[0] val next = actionIdList[0]
actionIdList.removeAt(0) actionIdList.removeAt(0)
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
// return NOTIFICATION_ACTION_WEATHER return ACTION_ID_WIFI
} }
return next return next
} }
......
...@@ -69,6 +69,7 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i ...@@ -69,6 +69,7 @@ class EmailActivity : BaseActivity<ActivityEmailBinding>(ActivityEmailBinding::i
startActivity(Intent(this, EmailCodeActivity::class.java).apply { startActivity(Intent(this, EmailCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(email)) putExtra("data", Gson().toJson(email))
}) })
finish()
} }
} }
} }
\ No newline at end of file
...@@ -58,6 +58,7 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl ...@@ -58,6 +58,7 @@ class TextActivity : BaseActivity<ActivityTextBinding>(ActivityTextBinding::infl
textUIBean.content = binding.edit.text.toString() textUIBean.content = binding.edit.text.toString()
putExtra("data", Gson().toJson(textUIBean)) putExtra("data", Gson().toJson(textUIBean))
}) })
finish()
} }
} }
} }
\ No newline at end of file
...@@ -68,6 +68,7 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind ...@@ -68,6 +68,7 @@ class WebsiteActivity : BaseActivity<ActivityWebsiteBinding>(ActivityWebsiteBind
startActivity(Intent(this, WebsiteCodeActivity::class.java).apply { startActivity(Intent(this, WebsiteCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(websiteUIBean)) putExtra("data", Gson().toJson(websiteUIBean))
}) })
finish()
} else { } else {
toast("This is not a valid website address", true) toast("This is not a valid website address", true)
} }
......
...@@ -150,6 +150,7 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl ...@@ -150,6 +150,7 @@ class WifiActivity : BaseActivity<ActivityWifiBinding>(ActivityWifiBinding::infl
startActivity(Intent(this@WifiActivity, WifiCodeActivity::class.java).apply { startActivity(Intent(this@WifiActivity, WifiCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(currentWifi)) putExtra("data", Gson().toJson(currentWifi))
}) })
finish()
} }
binding.switchHidden.setOnCheckedChangeListener { buttonView, isChecked -> binding.switchHidden.setOnCheckedChangeListener { buttonView, isChecked ->
currentWifi.hidden = isChecked currentWifi.hidden = isChecked
......
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