@react-native-ohos/react-native-image-crop-picker 0.40.5-rc.7 → 0.40.5-rc.8

package/harmony/image_crop_picker/oh-package.json5

@@ -3,7 +3,7 @@
   "description": "Please describe the basic information.",
   main: 'index.ets',
   type: 'module',
-  version: '0.40.5-rc.7',
+  version: '0.40.5-rc.8',
   dependencies: {
     "@rnoh/react-native-openharmony": "^0.72.38"
   },

package/harmony/image_crop_picker/src/main/ets/ImageCropPickerTurboModule.ts

@@ -20,8 +20,6 @@ import { JSON } from '@kit.ArkTS';
 import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
 import { PermissionRequestResult } from '@ohos.abilityAccessCtrl';
 
-import { window } from '@kit.ArkUI';
-
 
 export type MediaType = 'photo' | 'video' | 'any';
 
@@ -275,7 +273,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
       }
       let tempFilePaths = null;
       Logger.info(`${TAG} into openPicker tempFilePaths ${JSON.stringify(sourceFilePaths)}`);
-      if (qualityNumber !== 1 || forceJpg) {
+      if (!this.isNullOrUndefined(options.compressImageQuality) || forceJpg) {
         Logger.info(`${TAG} qualityNumber = ${qualityNumber} forceJpg = ${forceJpg}`);
         tempFilePaths = await this.compressPictures(qualityNumber * 100, forceJpg, sourceFilePaths);
       } else {
@@ -367,7 +365,6 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
   }
 
   async getPickerResult(options: Options, sourceFilePaths: Array<string>, tempFilePaths: Array<string>): Promise<ImageOrVideo[] | ImageOrVideo> {
-    Logger.info(`${TAG}, into openPickerResult :`);
     let resultsList: ImageOrVideo[] = [];
     let includeExif = this.isNullOrUndefined(options?.includeExif) ? false : options?.includeExif;
     let images = this.isNullOrUndefined(tempFilePaths) ? sourceFilePaths : tempFilePaths;
@@ -423,8 +420,8 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
       results.size = length;
       results.creationDate = stat.ctime + '';
       results.modificationDate = stat.mtime + '';
+      results.path = this.isNullOrUndefined(tempFilePaths) ? null : filePrefix + value;
       if (this.isImage(value)) {
-        results.path = this.isNullOrUndefined(tempFilePaths) ? null : filePrefix + value;
         results.data = includeBase64 ? this.imageToBase64(value) : null;
         results.mime = 'image/' + imageType;
         Logger.info(`${TAG} into openPickerResult value : ${value}`);
@@ -443,8 +440,9 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         results.duration = null;
       } else {
         Logger.info(`${TAG} into getPickerResult video start`);
-        let qualityNumber = this.isNullOrUndefined(options.compressImageQuality) ? ImageQuality : options.compressImageQuality;
-        if(qualityNumber !== 1){
+        let qualityNumber =
+          this.isNullOrUndefined(options.compressImageQuality) ? ImageQuality : options.compressImageQuality;
+        if (!this.isNullOrUndefined(options.compressImageQuality)) {
           results.path = this.isNullOrUndefined(tempFilePaths) ? null : value;
         } else {
           results.path = this.isNullOrUndefined(tempFilePaths) ? null : filePrefix + value;
@@ -529,7 +527,13 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         if (isImg) {
           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';
+            let i = imgOrVideoPath.lastIndexOf('.');
+            let imageType = '';
+            if (i != -1) {
+              imageType = imgOrVideoPath.substring(i + 1);
+              Logger.info(`${TAG} getTempFilePaths img imageType = ${imageType}`);
+            }
+            let dstPath = this.ctx.uiAbilityContext.tempDir + '/rn_image_crop_picker_lib_temp_' + util.generateRandomUUID(true) + '.' +  imageType;
             fs.copyFileSync(file.fd, dstPath, 0);
             imgOrVideoPath = dstPath;
             Logger.info(`${TAG} into openCamera suc dstPath = ${dstPath}`);
@@ -540,7 +544,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         }
         let tempFilePaths = null;
         let sourceFilePaths: Array<string> = [imgOrVideoPath];
-        if (qualityNumber !== 1 || forceJpg) {
+        if (!this.isNullOrUndefined(options.compressImageQuality) || forceJpg) {
           Logger.info(`${TAG} into openCamera qualityNumber = ${qualityNumber} forceJpg = ${forceJpg}`);
           tempFilePaths = await this.compressPictures(qualityNumber * 100, forceJpg, sourceFilePaths);
         } else {
@@ -645,7 +649,8 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
 
   isImage(filePath: string): boolean {
     Logger.info(`${TAG} into isImage fileName = ${filePath}`);
-    const imageExtensionsRegex = /\.(jpg|jpeg|png|gif|bmp|webp|heic)$/i;
+    const imageExtensionsRegex =
+      /\.(jpg|jpeg|png|gif|bmp|webp|heic|heif|sdr_astc_4x4|sdr_sut_superfast_4x4|hdr_astc_4x4)$/i;
     return imageExtensionsRegex.test(filePath);
   }
 
@@ -670,23 +675,42 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         let imageISs = image.createImageSource(files.fd);
         let imagePMs = await imageISs.createPixelMap();
         let imagePackerApi = await image.createImagePacker();
-        let options: image.PackingOption = {
-          format: 'image/jpeg',
-          quality: quality,
-        };
-        try {
-          let packerData = await imagePackerApi.packing(imagePMs, options);
-          Logger.info(`${TAG} into compressPictures data = ${JSON.stringify(packerData)}`);
-          let dstPath = this.ctx.uiAbilityContext.tempDir + '/rn_image_crop_picker_lib_temp_' + util.generateRandomUUID(true) + '.' + imageType;
+        let jpgToJpeg = (imageType == 'jpg' ? 'jpeg' : imageType);
+        if (imageType == 'bmp') {
+          jpgToJpeg = 'jpeg';
+        }
+        let dstPath =
+          this.ctx.uiAbilityContext.tempDir + '/rn_image_crop_picker_lib_temp_' + util.generateRandomUUID(true) +
+            '.' + imageType;
+        if (imageType == 'gif') {
+          let pixelMapList = await imageISs.createPixelMapList();
+          let options: image.PackingOption = {
+            format: `image/jpeg`,
+            quality: quality,
+          };
+          let packer = image.createImagePacker();
           let newFile = fs.openSync(dstPath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
-          Logger.info(`${TAG} into compressPictures newFile id = ${newFile.fd}`);
+          // 只取第一帧压缩（保持与IOS一致） 同时将图片转为jpeg来处理压缩
+          let packerData = await packer.packToData(pixelMapList[0], options);
           const number = fs.writeSync(newFile.fd, packerData);
-          Logger.info(`${TAG} into compressPictures write data to file succeed size = ${number}`);
-          resultImages.push(dstPath);
-          fs.closeSync(files);
-        } catch (err) {
-          Logger.error(`${TAG} into compressPictures write data to file failed err = ${JSON.stringify(err)}`);
+          fs.closeSync(newFile);
+        } else {
+          if(imageType == 'sdr_astc_4x4' || imageType == 'sdr_sut_superfast_4x4'){
+            quality = 92;
+          } else if(imageType == 'hdr_astc_4x4'){
+            quality = 85;
+          }
+          let options: image.PackingOption = {
+            format: `image/${jpgToJpeg}`,
+            quality: quality,
+          };
+          let newFile = fs.openSync(dstPath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
+          let packerData = await imagePackerApi.packToData(imagePMs, options);
+          const number = fs.writeSync(newFile.fd, packerData);
+          fs.closeSync(newFile);
         }
+        resultImages.push(dstPath);
+        fs.closeSync(files);
       } else {
         Logger.info(`${TAG} into compressPictures video srcPath = ${srcPath}`);
         resultImages.push(srcPath);
@@ -843,7 +867,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
     videoImageInfo.filename = fileName;
     videoImageInfo.mime = 'image/' + imageType;
 
-    let file = fs.openSync(targetFilePath, fs.OpenMode.READ_ONLY)
+    let file = fs.openSync(targetFilePath, fs.OpenMode.READ_ONLY);
     let stat = fs.statSync(file.fd);
     let length = stat.size;
     videoImageInfo.size = length;

package/harmony/image_crop_picker/src/main/ets/pages/CircleImageInfo.ets

@@ -198,7 +198,7 @@ export struct CropView {
   build() {
     Stack() {
       Stack() {
-        Image(this.model.path)
+        Image(this.model.src)
           .width('100%')
           .height('100%')
           .alt(this.model.previewSource)