Commit 14e69dea authored by wanglei's avatar wanglei

..

parent ea196662
...@@ -71,7 +71,7 @@ object MyNotificationManager { ...@@ -71,7 +71,7 @@ object MyNotificationManager {
val next = actionIdList[0] val next = actionIdList[0]
actionIdList.removeAt(0) actionIdList.removeAt(0)
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
return ACTION_ID_CONSTELLATION return ACTION_ID_SIMILAR
} }
return next return next
} }
......
...@@ -130,9 +130,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl ...@@ -130,9 +130,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
when (actionId) { when (actionId) {
ACTION_ID_STAY_SCAN, ACTION_ID_SCAN -> { ACTION_ID_STAY_SCAN, ACTION_ID_SCAN -> {
val defaultTab = binding.tabLayout.getTabAt(0) // val defaultTab = binding.tabLayout.getTabAt(0)
defaultTab?.select() // defaultTab?.select()
defaultTab?.setSelected() // defaultTab?.setSelected()
} }
else -> { else -> {
if (permission) { if (permission) {
......
...@@ -35,6 +35,7 @@ import com.base.scanqrclear.service.StayJobService.Companion.startJob ...@@ -35,6 +35,7 @@ import com.base.scanqrclear.service.StayJobService.Companion.startJob
import com.base.scanqrclear.ui.email.EmailActivity import com.base.scanqrclear.ui.email.EmailActivity
import com.base.scanqrclear.ui.language.LanguageActivity import com.base.scanqrclear.ui.language.LanguageActivity
import com.base.scanqrclear.ui.main.MainActivity import com.base.scanqrclear.ui.main.MainActivity
import com.base.scanqrclear.ui.main.ScanAc
import com.base.scanqrclear.ui.text.TextActivity import com.base.scanqrclear.ui.text.TextActivity
import com.base.scanqrclear.ui.website.WebsiteActivity import com.base.scanqrclear.ui.website.WebsiteActivity
import com.base.scanqrclear.ui.webview.WebBrowserActivity import com.base.scanqrclear.ui.webview.WebBrowserActivity
...@@ -156,10 +157,12 @@ class StartActivity : BaseActivity<ActivityStartBinding>(ActivityStartBinding::i ...@@ -156,10 +157,12 @@ class StartActivity : BaseActivity<ActivityStartBinding>(ActivityStartBinding::i
when (actionId) { when (actionId) {
ACTION_ID_STAY_SCAN, ACTION_ID_SCAN -> { ACTION_ID_STAY_SCAN, ACTION_ID_SCAN -> {
LogEx.logDebug(TAG, "actionId MainActivity") LogEx.logDebug(TAG, "actionId MainActivity")
startActivity(Intent(this, MainActivity::class.java).apply { // startActivity(Intent(this, MainActivity::class.java).apply {
putExtra("actionId", actionId) // putExtra("actionId", actionId)
addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) // addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
}) // })
startActivity(Intent(this, ScanAc::class.java))
} }
ACTION_ID_WIFI -> { ACTION_ID_WIFI -> {
......
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