Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
S
scanqrwhitecopy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanglei
scanqrwhitecopy
Commits
14e69dea
Commit
14e69dea
authored
Jan 23, 2025
by
wanglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
..
parent
ea196662
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
MyNotificationManager.kt
...ase/scanqrclear/fcm/notification/MyNotificationManager.kt
+1
-1
MainActivity.kt
...rc/main/java/com/base/scanqrclear/ui/main/MainActivity.kt
+3
-3
StartActivity.kt
.../main/java/com/base/scanqrclear/ui/start/StartActivity.kt
+7
-4
No files found.
app/src/main/java/com/base/scanqrclear/fcm/notification/MyNotificationManager.kt
View file @
14e69dea
...
@@ -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
}
}
...
...
app/src/main/java/com/base/scanqrclear/ui/main/MainActivity.kt
View file @
14e69dea
...
@@ -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
)
{
...
...
app/src/main/java/com/base/scanqrclear/ui/start/StartActivity.kt
View file @
14e69dea
...
@@ -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
->
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment