Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile-Cn-Ko-En
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-Cn-Ko-En
Commits
9fc4140d
Commit
9fc4140d
authored
Dec 17, 2018
by
feihuaduo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改决斗助手权限判断位置,如果8.0以上的机子未开启通知权限则不开决斗助手
更改权限申请
parent
a0f630b0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
5 deletions
+23
-5
mobile/src/main/AndroidManifest.xml
mobile/src/main/AndroidManifest.xml
+2
-0
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
.../java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
+12
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/PermissionsActivity.java
...n/garymb/ygomobile/ui/activities/PermissionsActivity.java
+6
-3
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
...c/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
+2
-0
mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java
...c/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java
+1
-1
No files found.
mobile/src/main/AndroidManifest.xml
View file @
9fc4140d
...
...
@@ -169,6 +169,8 @@
<activity
android:name=
"cn.garymb.ygomobile.ui.mycard.mcchat.SplashActivity"
/>
<activity
android:name=
"cn.garymb.ygomobile.ui.activities.FileLogActivity"
/>
<activity
android:name=
"cn.garymb.ygomobile.ui.activities.PermissionsActivity"
/>
<service
android:name=
"cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant"
android:priority=
"1000"
/>
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java
View file @
9fc4140d
package
cn.garymb.ygomobile.ui.activities
;
import
android.Manifest
;
import
android.annotation.SuppressLint
;
import
android.app.Activity
;
import
android.content.Context
;
...
...
@@ -29,9 +30,17 @@ public class BaseActivity extends AppCompatActivity {
private
Toast
mToast
;
protected
String
[]
getPermissions
()
{
return
null
;
return
PERMISSIONS
;
}
protected
final
String
[]
PERMISSIONS
={
// Manifest.permission.RECORD_AUDIO,
Manifest
.
permission
.
READ_PHONE_STATE
,
Manifest
.
permission
.
SYSTEM_ALERT_WINDOW
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
,
Manifest
.
permission
.
READ_EXTERNAL_STORAGE
,
};
@Override
protected
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
...
...
@@ -164,6 +173,7 @@ public class BaseActivity extends AppCompatActivity {
}
}
@SuppressLint
(
"RestrictedApi"
)
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN
)
@Override
public
void
startActivityForResult
(
Intent
intent
,
int
requestCode
,
@Nullable
Bundle
options
)
{
...
...
@@ -201,6 +211,7 @@ public class BaseActivity extends AppCompatActivity {
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
// 拒绝时, 关闭页面, 缺少主要权限, 无法运行
if
(
requestCode
==
REQUEST_PERMISSIONS
&&
resultCode
==
PermissionsActivity
.
PERMISSIONS_DENIED
)
{
showToast
(
"喵不给我权限让我怎么运行?!"
);
finish
();
}
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/PermissionsActivity.java
View file @
9fc4140d
...
...
@@ -105,7 +105,7 @@ public class PermissionsActivity extends AppCompatActivity {
allPermissionsGranted
();
}
else
{
isRequireCheck
=
false
;
showMissingPermissionDialog
();
showMissingPermissionDialog
(
permissions
);
}
}
...
...
@@ -120,10 +120,13 @@ public class PermissionsActivity extends AppCompatActivity {
}
// 显示缺失权限提示
private
void
showMissingPermissionDialog
()
{
private
void
showMissingPermissionDialog
(
String
[]
permissionList
)
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
PermissionsActivity
.
this
);
builder
.
setTitle
(
R
.
string
.
help
);
builder
.
setMessage
(
R
.
string
.
string_help_text
);
String
noPermission
=
""
;
for
(
String
s:
permissionList
)
noPermission
+=
"\n"
+
s
;
builder
.
setMessage
(
getString
(
R
.
string
.
string_help_text
)+
noPermission
);
// 拒绝, 退出应用
builder
.
setNegativeButton
(
R
.
string
.
quit
,
new
DialogInterface
.
OnClickListener
()
{
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @
9fc4140d
...
...
@@ -75,6 +75,7 @@ import cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant;
import
cn.garymb.ygomobile.ui.preference.SettingsActivity
;
import
cn.garymb.ygomobile.utils.AlipayPayUtils
;
import
cn.garymb.ygomobile.utils.FileLogUtil
;
import
cn.garymb.ygomobile.utils.PermissionUtil
;
import
cn.garymb.ygomobile.utils.ScreenUtil
;
public
abstract
class
HomeActivity
extends
BaseActivity
implements
NavigationView
.
OnNavigationItemSelectedListener
{
...
...
@@ -129,6 +130,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
checkPgyerUpdateSilent
(
getContext
(),
false
,
false
,
false
);
//ServiceDuelAssistant
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
if
(
PermissionUtil
.
isNotificationPermission
(
this
)==
null
)
this
.
startForegroundService
(
new
Intent
(
this
,
ServiceDuelAssistant
.
class
));
}
else
{
startService
(
new
Intent
(
this
,
ServiceDuelAssistant
.
class
));
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java
View file @
9fc4140d
...
...
@@ -56,7 +56,7 @@ public class MainActivity extends HomeActivity{
YGOStarter
.
onCreated
(
this
);
mImageUpdater
=
new
ImageUpdater
(
this
);
//动态权限
ActivityCompat
.
requestPermissions
(
this
,
PERMISSIONS
,
0
);
//
ActivityCompat.requestPermissions(this, PERMISSIONS, 0);
}
@SuppressLint
({
"StringFormatMatches"
,
"StringFormatInvalid"
})
...
...
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