去掉多余的权限限制
This commit is contained in:
parent
846b425040
commit
3709188cd8
|
|
@ -85,9 +85,7 @@
|
||||||
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
|
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
<uses-permission
|
|
||||||
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
|
||||||
android:maxSdkVersion="32" />
|
|
||||||
<uses-permission android:name="android.permission.VIBRATE" />
|
<uses-permission android:name="android.permission.VIBRATE" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||||
|
|
@ -128,10 +126,24 @@
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
|
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||||
|
|
||||||
|
|
||||||
|
<!--android13变更-->
|
||||||
|
<!-- 缓存资源优先存入SDcard -->
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||||
|
android:maxSdkVersion="32" />
|
||||||
|
<!-- 外置存储存取权限 -->
|
||||||
<uses-permission
|
<uses-permission
|
||||||
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
||||||
android:maxSdkVersion="32" />
|
android:maxSdkVersion="32" />
|
||||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
<uses-permission
|
||||||
|
android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
|
||||||
|
android:maxSdkVersion="32" />
|
||||||
|
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
|
||||||
|
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
|
||||||
|
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
|
||||||
|
|
||||||
<!-- ###################声明友盟分享SDK使用的相关权限###################### -->
|
<!-- ###################声明友盟分享SDK使用的相关权限###################### -->
|
||||||
<!-- 检测网络状态 -->
|
<!-- 检测网络状态 -->
|
||||||
|
|
@ -151,10 +163,6 @@
|
||||||
<!-- 控制呼吸灯,振动器等,用于新消息提醒 -->
|
<!-- 控制呼吸灯,振动器等,用于新消息提醒 -->
|
||||||
<uses-permission android:name="android.permission.FLASHLIGHT" />
|
<uses-permission android:name="android.permission.FLASHLIGHT" />
|
||||||
<uses-permission android:name="android.permission.VIBRATE" />
|
<uses-permission android:name="android.permission.VIBRATE" />
|
||||||
<!-- 外置存储存取权限 -->
|
|
||||||
<uses-permission
|
|
||||||
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
|
||||||
android:maxSdkVersion="32" />
|
|
||||||
|
|
||||||
<!-- 多媒体相关 -->
|
<!-- 多媒体相关 -->
|
||||||
<uses-permission android:name="android.permission.CAMERA" />
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
|
|
@ -175,8 +183,6 @@
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<!-- 获取mac地址作为用户的备用唯一标识 -->
|
<!-- 获取mac地址作为用户的备用唯一标识 -->
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||||
<!-- 缓存资源优先存入SDcard -->
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
|
||||||
<!-- 允许应用程序联网,以便向我们的服务器端发送数据 -->
|
<!-- 允许应用程序联网,以便向我们的服务器端发送数据 -->
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.media.AudioManager;
|
import android.media.AudioManager;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
|
|
@ -110,6 +111,15 @@ public class LoadingActivity extends BaseActivityNotAnim {
|
||||||
private PermissionHelper permissionHelper;
|
private PermissionHelper permissionHelper;
|
||||||
private static String firstShowPrivacy = "firstShowPrivacy";
|
private static String firstShowPrivacy = "firstShowPrivacy";
|
||||||
|
|
||||||
|
String[] permission;
|
||||||
|
String[] permissionM = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_PHONE_STATE};
|
||||||
|
|
||||||
|
String[] permission13 = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_PHONE_STATE,
|
||||||
|
android.Manifest.permission.READ_MEDIA_IMAGES,
|
||||||
|
android.Manifest.permission.READ_MEDIA_VIDEO,
|
||||||
|
android.Manifest.permission.READ_MEDIA_AUDIO};
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
@ -121,13 +131,19 @@ public class LoadingActivity extends BaseActivityNotAnim {
|
||||||
setIntent(new Intent()); // 从堆栈恢复,不再重复解析之前的intent
|
setIntent(new Intent()); // 从堆栈恢复,不再重复解析之前的intent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
permission = permission13;
|
||||||
|
} else {
|
||||||
|
permission = permissionM;
|
||||||
|
}
|
||||||
|
|
||||||
|
permissionHelper = new PermissionHelper(LoadingActivity.this, permission, 250);
|
||||||
|
|
||||||
Boolean showPrivacy = SPUtil.getInstance(getApplicationContext()).getBoolean(firstShowPrivacy, false);
|
Boolean showPrivacy = SPUtil.getInstance(getApplicationContext()).getBoolean(firstShowPrivacy, false);
|
||||||
Boolean aBoolean = ConfigUtil.getInstance(getApplicationContext()).getBoolean(LoginSPKey.IS_FirstOpen, false);
|
Boolean aBoolean = ConfigUtil.getInstance(getApplicationContext()).getBoolean(LoginSPKey.IS_FirstOpen, false);
|
||||||
if(!aBoolean && !showPrivacy){
|
if(!aBoolean && !showPrivacy){
|
||||||
startPrivacyTextDialog();
|
startPrivacyTextDialog();
|
||||||
}else{
|
}else{
|
||||||
String[] permission = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_PHONE_STATE};
|
|
||||||
permissionHelper = new PermissionHelper(LoadingActivity.this, permission, 250);
|
|
||||||
getPermission();
|
getPermission();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -977,8 +993,6 @@ public class LoadingActivity extends BaseActivityNotAnim {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
alertDialog.cancel();
|
alertDialog.cancel();
|
||||||
SPUtil.getInstance(getApplicationContext()).putBoolean(firstShowPrivacy,true);
|
SPUtil.getInstance(getApplicationContext()).putBoolean(firstShowPrivacy,true);
|
||||||
String[] permission = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_PHONE_STATE};
|
|
||||||
permissionHelper = new PermissionHelper(LoadingActivity.this, permission, 250);
|
|
||||||
getPermission();
|
getPermission();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,11 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
private BGABadgeImageView bageview;
|
private BGABadgeImageView bageview;
|
||||||
public static Activity cam_ctx;
|
public static Activity cam_ctx;
|
||||||
private PermissionHelper permissionHelper;
|
private PermissionHelper permissionHelper;
|
||||||
String[] permission = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_PHONE_STATE};
|
|
||||||
|
String[] permission;
|
||||||
|
String[] permissionM = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.READ_PHONE_STATE};
|
||||||
|
|
||||||
|
String[] permission13 = new String[]{android.Manifest.permission.CAMERA, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.READ_PHONE_STATE};
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
|
@ -209,7 +213,15 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
initRollViewPager();
|
initRollViewPager();
|
||||||
adInfos();
|
adInfos();
|
||||||
initInformation();
|
initInformation();
|
||||||
|
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
permission = permission13;
|
||||||
|
} else {
|
||||||
|
permission = permissionM;
|
||||||
|
}
|
||||||
|
|
||||||
permissionHelper = new PermissionHelper(DeviceFragment.this, permission, 250);
|
permissionHelper = new PermissionHelper(DeviceFragment.this, permission, 250);
|
||||||
|
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue