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
@@ -470,8 +470,21 @@ public class BiochemistryActivity extends BaseActivity implements AdapterView.On
// TODO Auto-generated method stub
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (PermissionsUtil.hasPermission(BiochemistryActivity.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(BiochemistryActivity.this, Manifest.permission.CAMERA);
permissionsToRequest = new String[]{Manifest.permission.CAMERA};
} else {
// Android 12及以下需要 CAMERA 和存储权限
hasPermission = PermissionsUtil.hasPermission(BiochemistryActivity.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 {
@@ -492,7 +505,7 @@ public class BiochemistryActivity extends BaseActivity implements AdapterView.On
}
}, new String[]{ Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});
}, permissionsToRequest);
}
}else {
@@ -508,11 +521,17 @@ public class BiochemistryActivity extends BaseActivity implements AdapterView.On
@Override
public void onClick(View v) {
// TODO Auto-generated method
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (PermissionsUtil.hasPermission(BiochemistryActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
//有访问摄像头的权限,读写内存,网络定位,打电话,读取短信,录音,通讯录
Intent intent = new Intent(mActivity, PhotoAlbumActivity.class);
// Android 6.0 ~ 12 使用旧的存储权限
boolean hasPermission;
String[] permissionsToRequest;
hasPermission = PermissionsUtil.hasPermission(BiochemistryActivity.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) {
//有访问相册的权限
Intent intent = new Intent(mActivity, AllPhotosActivity.class);
intent.putExtra("photonum", "" + (mBitmaps.size() - 1));
intent.putExtra("maxphotonum",9);
startActivityForResult(intent,
@@ -525,7 +544,7 @@ public class BiochemistryActivity extends BaseActivity implements AdapterView.On
@Override
public void permissionGranted(@NonNull String[] permissions) {
EasyWindow.cancelAll();
Intent intent = new Intent(BiochemistryActivity.this, PhotoAlbumActivity.class);
Intent intent = new Intent(BiochemistryActivity.this, AllPhotosActivity.class);
intent.putExtra("photonum", "" + (mBitmaps.size() - 1));
intent.putExtra("maxphotonum",9);
startActivityForResult(intent,SELECT_PIC_BY_PICK_PHOTO);
@@ -539,15 +558,10 @@ public class BiochemistryActivity extends BaseActivity implements AdapterView.On
}
}, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE});
}, permissionsToRequest);
}
}else {
Intent intent = new Intent(BiochemistryActivity.this, PhotoAlbumActivity.class);
intent.putExtra("photonum", "" + (mBitmaps.size() - 1));
intent.putExtra("maxphotonum",9);
startActivityForResult(intent,SELECT_PIC_BY_PICK_PHOTO);
}
}