Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
P
PDF Viewer Scanner White
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
PDF Viewer Scanner White
Commits
294472a7
Commit
294472a7
authored
Jan 06, 2025
by
周文华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修复】1.修复循环获取通知栏事件id导致的崩溃。2.修复空数据导致的崩溃。3.修复部分机型跳转页缺失导致的崩溃。
parent
0145597a
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
131 additions
and
53 deletions
+131
-53
NotificationUiUtil.kt
.../com/base/pdfviewerscannerwhite/fcm/NotificationUiUtil.kt
+96
-36
ColorProgress.kt
...a/com/base/pdfviewerscannerwhite/ui/view/ColorProgress.kt
+1
-0
PermissionUtils.kt
...a/com/base/pdfviewerscannerwhite/utils/PermissionUtils.kt
+34
-17
No files found.
app/src/main/java/com/base/pdfviewerscannerwhite/fcm/NotificationUiUtil.kt
View file @
294472a7
This diff is collapsed.
Click to expand it.
app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/ColorProgress.kt
View file @
294472a7
...
@@ -116,6 +116,7 @@ class ColorProgress : View {
...
@@ -116,6 +116,7 @@ class ColorProgress : View {
fun
animateProgress
(
list
:
List
<
ProgressBean
>)
{
fun
animateProgress
(
list
:
List
<
ProgressBean
>)
{
listProgressBean
=
list
listProgressBean
=
list
if
(
list
.
isEmpty
())
return
val
totalAngle
=
list
.
maxOf
{
it
.
sweepAngle
}
val
totalAngle
=
list
.
maxOf
{
it
.
sweepAngle
}
val
progressAnimator
=
ValueAnimator
.
ofFloat
(
0f
,
totalAngle
)
val
progressAnimator
=
ValueAnimator
.
ofFloat
(
0f
,
totalAngle
)
progressAnimator
.
interpolator
=
LinearInterpolator
()
// 平滑插值器
progressAnimator
.
interpolator
=
LinearInterpolator
()
// 平滑插值器
...
...
app/src/main/java/com/base/pdfviewerscannerwhite/utils/PermissionUtils.kt
View file @
294472a7
...
@@ -2,6 +2,7 @@ package com.base.pdfviewerscannerwhite.utils
...
@@ -2,6 +2,7 @@ package com.base.pdfviewerscannerwhite.utils
import
android.Manifest
import
android.Manifest
import
android.app.Activity
import
android.app.Activity
import
android.content.ActivityNotFoundException
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.content.pm.PackageManager
...
@@ -18,15 +19,20 @@ object PermissionUtils {
...
@@ -18,15 +19,20 @@ object PermissionUtils {
return
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
R
)
{
return
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
R
)
{
Environment
.
isExternalStorageManager
()
Environment
.
isExternalStorageManager
()
}
else
{
}
else
{
val
readPermission
=
ActivityCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
READ_EXTERNAL_STORAGE
)
val
readPermission
=
val
writePermission
=
ActivityCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
)
ActivityCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
READ_EXTERNAL_STORAGE
)
val
writePermission
=
ActivityCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
)
return
readPermission
==
PackageManager
.
PERMISSION_GRANTED
&&
writePermission
==
PackageManager
.
PERMISSION_GRANTED
;
return
readPermission
==
PackageManager
.
PERMISSION_GRANTED
&&
writePermission
==
PackageManager
.
PERMISSION_GRANTED
;
}
}
}
}
fun
Context
.
checkNotificationPermission
():
Boolean
{
fun
Context
.
checkNotificationPermission
():
Boolean
{
return
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
TIRAMISU
)
{
return
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
TIRAMISU
)
{
ActivityCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
POST_NOTIFICATIONS
)
==
PackageManager
.
PERMISSION_GRANTED
ActivityCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
POST_NOTIFICATIONS
)
==
PackageManager
.
PERMISSION_GRANTED
}
else
{
}
else
{
return
true
return
true
}
}
...
@@ -38,7 +44,10 @@ object PermissionUtils {
...
@@ -38,7 +44,10 @@ object PermissionUtils {
fun
Activity
.
userDenyNotificationPermission
():
Boolean
{
fun
Activity
.
userDenyNotificationPermission
():
Boolean
{
val
shouldShowRationale
=
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
TIRAMISU
)
{
val
shouldShowRationale
=
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
TIRAMISU
)
{
ActivityCompat
.
shouldShowRequestPermissionRationale
(
this
,
Manifest
.
permission
.
POST_NOTIFICATIONS
)
ActivityCompat
.
shouldShowRequestPermissionRationale
(
this
,
Manifest
.
permission
.
POST_NOTIFICATIONS
)
}
else
{
}
else
{
true
true
}
}
...
@@ -55,7 +64,7 @@ object PermissionUtils {
...
@@ -55,7 +64,7 @@ object PermissionUtils {
jumpAction
:
(()
->
Unit
)?
=
null
,
jumpAction
:
(()
->
Unit
)?
=
null
,
result
:
(
flag
:
Boolean
)
->
Unit
result
:
(
flag
:
Boolean
)
->
Unit
)
{
)
{
try
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
R
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
R
)
{
val
intent
=
val
intent
=
Intent
(
Settings
.
ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
)
Intent
(
Settings
.
ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
)
...
@@ -66,10 +75,18 @@ object PermissionUtils {
...
@@ -66,10 +75,18 @@ object PermissionUtils {
result
.
invoke
(
checkStorePermission
())
result
.
invoke
(
checkStorePermission
())
}
}
}
else
{
}
else
{
launcher
.
launch
(
arrayOf
(
Manifest
.
permission
.
READ_EXTERNAL_STORAGE
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
))
{
map
->
launcher
.
launch
(
arrayOf
(
Manifest
.
permission
.
READ_EXTERNAL_STORAGE
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
)
)
{
map
->
result
(
map
.
values
.
all
{
it
})
result
(
map
.
values
.
all
{
it
})
}
}
}
}
}
catch
(
_
:
ActivityNotFoundException
)
{
}
}
}
}
}
\ No newline at end of file
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