diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml
index b9c934691..e524738e8 100644
--- a/iFish7/src/main/AndroidManifest.xml
+++ b/iFish7/src/main/AndroidManifest.xml
@@ -85,9 +85,7 @@
-
+
@@ -128,10 +126,24 @@
+
+
+
+
+
+
+
-
+
+
+
+
@@ -151,10 +163,6 @@
-
-
@@ -175,8 +183,6 @@
-
-
diff --git a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
index 5065f7094..7f4199f4c 100644
--- a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.media.AudioManager;
+import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.os.Handler;
@@ -110,6 +111,15 @@ public class LoadingActivity extends BaseActivityNotAnim {
private PermissionHelper permissionHelper;
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
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -121,13 +131,19 @@ public class LoadingActivity extends BaseActivityNotAnim {
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 aBoolean = ConfigUtil.getInstance(getApplicationContext()).getBoolean(LoginSPKey.IS_FirstOpen, false);
if(!aBoolean && !showPrivacy){
startPrivacyTextDialog();
}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();
}
}
@@ -977,8 +993,6 @@ public class LoadingActivity extends BaseActivityNotAnim {
public void onClick(View v) {
alertDialog.cancel();
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();
}
});
diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
index ea776785a..b32d0088c 100644
--- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
@@ -187,7 +187,11 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
private BGABadgeImageView bageview;
public static Activity cam_ctx;
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
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -209,7 +213,15 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
initRollViewPager();
adInfos();
initInformation();
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ permission = permission13;
+ } else {
+ permission = permissionM;
+ }
+
permissionHelper = new PermissionHelper(DeviceFragment.this, permission, 250);
+
return v;
}