未验证 提交 ea8f9aa1 编写于 作者: 布兰柯基 提交者: GitHub

Merge pull request #707 from BestMafen/permission

optimize PermissionConstants
...@@ -3,6 +3,7 @@ package com.blankj.utilcode.constant; ...@@ -3,6 +3,7 @@ package com.blankj.utilcode.constant;
import android.Manifest; import android.Manifest;
import android.Manifest.permission; import android.Manifest.permission;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Build;
import android.support.annotation.StringDef; import android.support.annotation.StringDef;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -30,34 +31,39 @@ public final class PermissionConstants { ...@@ -30,34 +31,39 @@ public final class PermissionConstants {
public static final String SMS = Manifest.permission_group.SMS; public static final String SMS = Manifest.permission_group.SMS;
public static final String STORAGE = Manifest.permission_group.STORAGE; public static final String STORAGE = Manifest.permission_group.STORAGE;
private static final String[] GROUP_CALENDAR = { private static final String[] GROUP_CALENDAR = {
permission.READ_CALENDAR, permission.WRITE_CALENDAR permission.READ_CALENDAR, permission.WRITE_CALENDAR
}; };
private static final String[] GROUP_CAMERA = { private static final String[] GROUP_CAMERA = {
permission.CAMERA permission.CAMERA
}; };
private static final String[] GROUP_CONTACTS = { private static final String[] GROUP_CONTACTS = {
permission.READ_CONTACTS, permission.WRITE_CONTACTS, permission.GET_ACCOUNTS permission.READ_CONTACTS, permission.WRITE_CONTACTS, permission.GET_ACCOUNTS
}; };
private static final String[] GROUP_LOCATION = { private static final String[] GROUP_LOCATION = {
permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION
}; };
private static final String[] GROUP_MICROPHONE = { private static final String[] GROUP_MICROPHONE = {
permission.RECORD_AUDIO permission.RECORD_AUDIO
}; };
private static final String[] GROUP_PHONE = { private static final String[] GROUP_PHONE = {
permission.READ_PHONE_STATE, permission.READ_PHONE_NUMBERS, permission.CALL_PHONE, permission.READ_PHONE_STATE, permission.READ_PHONE_NUMBERS, permission.CALL_PHONE,
permission.ANSWER_PHONE_CALLS, permission.READ_CALL_LOG, permission.WRITE_CALL_LOG, permission.ANSWER_PHONE_CALLS, permission.READ_CALL_LOG, permission.WRITE_CALL_LOG,
permission.ADD_VOICEMAIL, permission.USE_SIP, permission.PROCESS_OUTGOING_CALLS permission.ADD_VOICEMAIL, permission.USE_SIP, permission.PROCESS_OUTGOING_CALLS
}; };
private static final String[] GROUP_SENSORS = { private static final String[] GROUP_PHONE_BELOW_O = {
permission.READ_PHONE_STATE, permission.READ_PHONE_NUMBERS, permission.CALL_PHONE,
permission.READ_CALL_LOG, permission.WRITE_CALL_LOG, permission.ADD_VOICEMAIL,
permission.USE_SIP, permission.PROCESS_OUTGOING_CALLS
};
private static final String[] GROUP_SENSORS = {
permission.BODY_SENSORS permission.BODY_SENSORS
}; };
private static final String[] GROUP_SMS = { private static final String[] GROUP_SMS = {
permission.SEND_SMS, permission.RECEIVE_SMS, permission.READ_SMS, permission.SEND_SMS, permission.RECEIVE_SMS, permission.READ_SMS,
permission.RECEIVE_WAP_PUSH, permission.RECEIVE_MMS, permission.RECEIVE_WAP_PUSH, permission.RECEIVE_MMS,
}; };
private static final String[] GROUP_STORAGE = { private static final String[] GROUP_STORAGE = {
permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE
}; };
...@@ -79,7 +85,11 @@ public final class PermissionConstants { ...@@ -79,7 +85,11 @@ public final class PermissionConstants {
case MICROPHONE: case MICROPHONE:
return GROUP_MICROPHONE; return GROUP_MICROPHONE;
case PHONE: case PHONE:
return GROUP_PHONE; if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
return GROUP_PHONE_BELOW_O;
} else {
return GROUP_PHONE;
}
case SENSORS: case SENSORS:
return GROUP_SENSORS; return GROUP_SENSORS;
case SMS: case SMS:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册