Skip to content
This repository was archived by the owner on Dec 13, 2024. It is now read-only.

fix:权限删除 #27

Merged
merged 3 commits into from
Jul 17, 2024
Merged

fix:权限删除 #27

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9333ca9
refactor:权限删除
Jul 17, 2024
a7b29af
fix:权限删除
Jul 17, 2024
4c04aa6
Merge branch 'sig' of https://github.com/lankun1009/react-native-imag…
Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions harmony/image_crop_picker/src/main/ets/ImageCropPickerTurboModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,6 @@ export class ImageCropPickerTurboModule extends TurboModule implements TM.ImageC

async openPicker(options?: Options): Promise<Video[] | Video | ImageOrVideo[] | ImageOrVideo | Image [] | Image> {
Logger.info(`${TAG} into openPicker request ${JSON.stringify(options)}`);
let permissionResult = await this.grantPermission();
if (!permissionResult) {
return new Promise(async(res, rej) => {
rej('permission not approved')
})
}
let minFiles = this.isNullOrUndefined(options?.minFiles) ? MinNumber : options.minFiles;
let maxFiles = this.isNullOrUndefined(options?.maxFiles) ? MaxNumber : options.maxFiles;
let isShowSerialNum = this.isNullOrUndefined(options?.showsSelectedCount) ? true : options?.showsSelectedCount;
Expand Down Expand Up @@ -391,12 +385,6 @@ export class ImageCropPickerTurboModule extends TurboModule implements TM.ImageC
async openCamera(options?: Options): Promise<Video[] | Video | ImageOrVideo[] | ImageOrVideo | Image [] | Image> {
Logger.info(`${TAG} into openCamera request = ${JSON.stringify(options)}`);
let cropping = this.isNullOrUndefined(options?.cropping) ? false : options?.cropping;
let permissionResult = await this.grantPermission();
if (!permissionResult) {
return new Promise(async(res, rej) => {
rej('permission not approved')
})
}
let quality = options.compressImageQuality;
if (!this.isNullOrUndefined(quality) && !(quality >= 0 && quality <= 1)) {
return new Promise(async(res, rej) => {
Expand Down Expand Up @@ -424,7 +412,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements TM.ImageC
let imgOrVideoPath = pickerResult.resultUri;
isImg = this.isImage(imgOrVideoPath);
if (isImg) {
let file = fs.openSync(imgOrVideoPath, fs.OpenMode.CREATE);
let file = fs.openSync(imgOrVideoPath, fs.OpenMode.READ_ONLY);
try {
let dstPath = this.ctx.uiAbilityContext.tempDir + '/rn_image_crop_picker_lib_temp_' + util.generateRandomUUID(true) + '.jpeg';
fs.copyFileSync(file.fd, dstPath, 0);
Expand Down Expand Up @@ -648,12 +636,6 @@ export class ImageCropPickerTurboModule extends TurboModule implements TM.ImageC
rej('path is empty')
})
}
let permissionResult = await this.grantPermission();
if (!permissionResult) {
return new Promise(async(res, rej) => {
rej('permission not approved')
})
}
let quality = options.compressImageQuality;
if (!this.isNullOrUndefined(quality) && !(quality >= 0 && quality <= 1)) {
return new Promise(async(res, rej) => {
Expand Down