This commit is contained in:
2025-12-15 14:10:54 +08:00
parent 434f134f53
commit 2491213ca6
361 changed files with 7533 additions and 5354 deletions
@@ -698,8 +698,21 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener,
// 拍照获取照片
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
// Android 13+ (API 33+) 拍照主要需要 CAMERA 权限
boolean hasPermission;
String[] permissionsToRequest;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
// Android 13+ 拍照主要需要 CAMERA 权限
hasPermission = PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.CAMERA);
permissionsToRequest = new String[]{Manifest.permission.CAMERA};
} else {
// Android 12及以下需要 CAMERA 和存储权限
hasPermission = PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE);
permissionsToRequest = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
}
if (hasPermission) {
//有访问摄像头的权限
takePhoto11();
} else {
@@ -720,7 +733,7 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener,
}
}, new String[]{ Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});
}, permissionsToRequest);
}
}else {
@@ -819,11 +832,20 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener,
private ArrayList<PhotoItem> paths;
private void pickPhoto() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
// Android 6.0 ~ 12 使用旧的存储权限
boolean hasPermission;
String[] permissionsToRequest;
hasPermission = PermissionsUtil.hasPermission(WriteTopicActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE);
permissionsToRequest = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
if (hasPermission) {
isTopic = 1;
Intent intent = new Intent(WriteTopicActivity.this,
PhotoAlbumActivity.class);
AllPhotosActivity.class);
intent.putExtra("photonum", "" + (mBitmaps.size() - 1));
intent.putExtra("isTopic", "isTopic");
startActivityForResult(intent, SELECT_PIC_BY_PICK_PHOTO);
@@ -837,7 +859,7 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener,
EasyWindow.cancelAll();
isTopic = 1;
Intent intent = new Intent(WriteTopicActivity.this,
PhotoAlbumActivity.class);
AllPhotosActivity.class);
intent.putExtra("photonum", "" + (mBitmaps.size() - 1));
intent.putExtra("isTopic", "isTopic");
startActivityForResult(intent, SELECT_PIC_BY_PICK_PHOTO);
@@ -846,21 +868,13 @@ public class WriteTopicActivity extends BaseActivity implements OnClickListener,
@Override
public void permissionDenied(@NonNull String[] permissions) {
EasyWindow.cancelAll();
//用户拒绝了访问读写的申请
//
//用户拒绝了访问相册的申请
}
}, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});
}, permissionsToRequest);
}
}else {
isTopic = 1;
Intent intent = new Intent(WriteTopicActivity.this,
PhotoAlbumActivity.class);
intent.putExtra("photonum", "" + (mBitmaps.size() - 1));
intent.putExtra("isTopic", "isTopic");
startActivityForResult(intent, SELECT_PIC_BY_PICK_PHOTO);
}
}