Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
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
fallenstardust
YGOMobile
Commits
14a69dae
Commit
14a69dae
authored
Jan 18, 2019
by
feihuaduo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复所有权限同意时无法进入软件的bug
parent
6c020133
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
4 deletions
+28
-4
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
.../java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
+24
-2
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/PermissionsActivity.java
...n/garymb/ygomobile/ui/activities/PermissionsActivity.java
+4
-2
No files found.
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
View file @
14a69dae
...
...
@@ -19,7 +19,10 @@ import android.view.MenuItem;
import
android.view.View
;
import
android.widget.Toast
;
import
java.io.IOException
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.utils.FileLogUtil
;
public
class
BaseActivity
extends
AppCompatActivity
{
...
...
@@ -56,7 +59,17 @@ public class BaseActivity extends AppCompatActivity {
@Override
protected
void
onResume
()
{
super
.
onResume
();
try
{
FileLogUtil
.
writeAndTime
(
"开始显示"
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
if
(
Build
.
VERSION
.
SDK_INT
<
Build
.
VERSION_CODES
.
M
||
!
startPermissionsActivity
()){
try
{
FileLogUtil
.
writeAndTime
(
"不申请权限"
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
onActivityResult
(
REQUEST_PERMISSIONS
,
PermissionsActivity
.
PERMISSIONS_GRANTED
,
null
);
}
}
...
...
@@ -197,8 +210,12 @@ public class BaseActivity extends AppCompatActivity {
String
[]
PERMISSIONS
=
getPermissions
();
if
(
PERMISSIONS
==
null
||
PERMISSIONS
.
length
==
0
)
return
false
;
PermissionsActivity
.
startActivityForResult
(
this
,
REQUEST_PERMISSIONS
,
PERMISSIONS
);
return
true
;
try
{
FileLogUtil
.
writeAndTime
(
"申请权限"
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
PermissionsActivity
.
startActivityForResult
(
this
,
REQUEST_PERMISSIONS
,
PERMISSIONS
);
}
@Override
...
...
@@ -213,6 +230,11 @@ public class BaseActivity extends AppCompatActivity {
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
try
{
FileLogUtil
.
writeAndTime
(
"resultcode值"
+
resultCode
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
// 拒绝时, 关闭页面, 缺少主要权限, 无法运行
if
(
requestCode
==
REQUEST_PERMISSIONS
&&
resultCode
==
PermissionsActivity
.
PERMISSIONS_DENIED
)
{
showToast
(
"喵不给我权限让我怎么运行?!"
);
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/PermissionsActivity.java
View file @
14a69dae
...
...
@@ -42,14 +42,16 @@ public class PermissionsActivity extends AppCompatActivity {
private
boolean
isRequireCheck
;
// 是否需要系统权限检测
// 启动当前权限页面的公开接口
public
static
void
startActivityForResult
(
Activity
activity
,
int
requestCode
,
String
...
permissions
)
{
if
(
permissions
==
null
||
permissions
.
length
==
0
)
return
;
public
static
boolean
startActivityForResult
(
Activity
activity
,
int
requestCode
,
String
...
permissions
)
{
if
(
permissions
==
null
||
permissions
.
length
==
0
)
return
false
;
PermissionsChecker
checker
=
PermissionsChecker
.
getPermissionsChecker
(
activity
);
if
(
checker
.
lacksPermissions
(
permissions
))
{
Intent
intent
=
new
Intent
(
activity
,
PermissionsActivity
.
class
);
intent
.
putExtra
(
EXTRA_PERMISSIONS
,
permissions
);
ActivityCompat
.
startActivityForResult
(
activity
,
intent
,
requestCode
,
null
);
return
true
;
}
return
false
;
}
@Override
...
...
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