Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
952491c5
Commit
952491c5
authored
Jun 11, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ImageDecoder API
parent
3fe2a137
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
...e/src/main/java/com/github/shadowsocks/ScannerActivity.kt
+2
-3
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
+10
-0
No files found.
mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
View file @
952491c5
...
...
@@ -23,7 +23,6 @@ package com.github.shadowsocks
import
android.app.Activity
import
android.content.Intent
import
android.content.pm.ShortcutManager
import
android.graphics.BitmapFactory
import
android.hardware.camera2.CameraAccessException
import
android.hardware.camera2.CameraManager
import
android.os.Build
...
...
@@ -38,6 +37,7 @@ import android.widget.Toast
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.utils.openBitmap
import
com.github.shadowsocks.utils.resolveResourceId
import
com.github.shadowsocks.utils.systemService
import
com.google.android.gms.common.GoogleApiAvailability
...
...
@@ -138,10 +138,9 @@ class ScannerActivity : AppCompatActivity(), Toolbar.OnMenuItemClickListener, Ba
var
list
=
listOfNotNull
(
data
?.
data
)
val
clipData
=
data
?.
clipData
if
(
clipData
!=
null
)
list
+=
(
0
until
clipData
.
itemCount
).
map
{
clipData
.
getItemAt
(
it
).
uri
}
val
resolver
=
contentResolver
for
(
uri
in
list
)
try
{
val
barcodes
=
detector
.
detect
(
Frame
.
Builder
()
.
setBitmap
(
BitmapFactory
.
decodeStream
(
resolver
.
openInputStream
(
uri
)
)).
build
())
.
setBitmap
(
contentResolver
.
openBitmap
(
uri
)).
build
())
for
(
i
in
0
until
barcodes
.
size
())
Profile
.
findAll
(
barcodes
.
valueAt
(
i
).
rawValue
).
forEach
{
ProfileManager
.
createProfile
(
it
)
success
=
true
...
...
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
View file @
952491c5
package
com.github.shadowsocks.utils
import
android.content.BroadcastReceiver
import
android.content.ContentResolver
import
android.content.Context
import
android.content.Intent
import
android.content.pm.PackageInfo
import
android.content.res.Resources
import
android.graphics.Bitmap
import
android.graphics.BitmapFactory
import
android.graphics.ImageDecoder
import
android.net.Uri
import
android.os.Build
import
android.support.annotation.AttrRes
import
android.support.v4.app.Fragment
...
...
@@ -54,6 +59,11 @@ val URLConnection.responseLength: Long
inline
fun
<
reified
T
>
Context
.
systemService
()
=
ContextCompat
.
getSystemService
(
this
,
T
::
class
.
java
)
!!
fun
ContentResolver
.
openBitmap
(
uri
:
Uri
):
Bitmap
?
{
return
if
(
Build
.
VERSION
.
SDK_INT
>=
28
)
ImageDecoder
.
decodeBitmap
(
ImageDecoder
.
createSource
(
this
,
uri
))
else
BitmapFactory
.
decodeStream
(
openInputStream
(
uri
))
}
val
PackageInfo
.
signaturesCompat
get
()
=
if
(
Build
.
VERSION
.
SDK_INT
>=
28
)
signingInfo
.
apkContentsSigners
else
@Suppress
(
"DEPRECATION"
)
signatures
...
...
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