@react-native-ohos/react-native-image-crop-picker 0.40.4 → 0.40.5-rc.11

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+### v0.40.5-rc.11
+
+- pre-release: @react-native-ohos/react-native-image-crop-picker@0.40.5-rc.11
+
+### v0.40.5-rc.10
+
+- fix: Adjust the saved format after image cropping and compression
+- pre-release: @react-native-ohos/react-native-image-crop-picker@0.40.5-rc.10
+
+### v0.40.5-rc.9
+
+- fix: Add the "freeStyleCropEnabled" attribute
+- pre-release: @react-native-ohos/react-native-image-crop-picker@0.40.5-rc.9
+
+## v0.40.5-rc.1
+- Fix the issue where the file size after compression is larger than the original file.
+
 ## v0.40.4-rc.1
 - react-native-image-crop-picker仓库迁移 ([e09dff16cc4c51bfdcec842921d3c30d49d39a19](https://gitee.com/openharmony-sig/rntpc_react-native-image-crop-picker/pulls/1))
 - chore: add COMMITTERS.md ([6e71f31b17e5aba5a60215b58ddc6f656def74f9](https://gitee.com/openharmony-sig/rntpc_react-native-image-crop-picker/pulls/2))

package/COMMITTERS.md

@@ -2,8 +2,4 @@
 ## 以下是此项目的committer人员
 不区分先后顺序
 
-- [MaDiXin](https://gitee.com/MaDiXin)
-- [xiafeng_xf_admin](https://gitee.com/xiafeng_xf_admin)
-- [chenLixi](https://gitee.com/Louis-C7)
-- [LinJiacheng](https://gitee.com/LLLLLLin)
-- [ZhengJinshou](https://gitee.com/longziz)
+- [xiafeng_xf_admin](https://gitee.com/xiafeng_xf_admin)

package/harmony/image_crop_picker/index.ets

@@ -1,6 +1,8 @@
 // Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
 // Use of this source code is governed by a MIT license that can be
 // found in the LICENSE file.
-
+import { ImageCropPickerPackage } from './src/main/ets/ImageCropPickerPackage'
 export { ImageEditInfo } from "./src/main/ets/pages/ImageEditInfo"
+export { CircleImageInfo } from "./src/main/ets/pages/CircleImageInfo"
 export * from "./ts";
+export default ImageCropPickerPackage

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.4',
+  version: '0.40.5-rc.11',
   dependencies: {
     "@rnoh/react-native-openharmony": "^0.72.38"
   },

package/harmony/image_crop_picker/src/main/cpp/generated/RNOH/generated/BaseReactNativeImageCropPickerPackage.h

@@ -63,4 +63,3 @@ class BaseReactNativeImageCropPickerPackage : public Package {
 };
 
 } // namespace rnoh
-

package/harmony/image_crop_picker/src/main/ets/{ImageCropPickerPackage.ts → ImageCropPickerPackage.ets}

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
+import { RNOHPackage } from '@rnoh/react-native-openharmony'
 import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import { ImageCropPickerTurboModule } from './ImageCropPickerTurboModule';
 
@@ -21,7 +22,7 @@ class ImageCropPickerTurboModulesFactory extends TurboModulesFactory {
 
 }
 
-export class ImageCropPickerPackage extends RNPackage {
+export class ImageCropPickerPackage extends RNOHPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new ImageCropPickerTurboModulesFactory(ctx);
   }

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;
@@ -443,6 +440,13 @@ 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 (!this.isNullOrUndefined(options.compressImageQuality)) {
+          results.path = this.isNullOrUndefined(tempFilePaths) ? null : value;
+        } else {
+          results.path = this.isNullOrUndefined(tempFilePaths) ? null : filePrefix + value;
+        }
         results.data = null;
         results.mime = 'video/' + imageType;
         let url = 'fd://' + file.fd;
@@ -523,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}`);
@@ -534,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 {
@@ -639,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);
   }
 
@@ -664,23 +675,19 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         let imageISs = image.createImageSource(files.fd);
         let imagePMs = await imageISs.createPixelMap();
         let imagePackerApi = await image.createImagePacker();
+        let dstPath =
+          this.ctx.uiAbilityContext.tempDir + '/rn_image_crop_picker_lib_temp_' + util.generateRandomUUID(true) +
+            '.' + imageType;
         let options: image.PackingOption = {
-          format: 'image/jpeg',
+          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 newFile = fs.openSync(dstPath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
-          Logger.info(`${TAG} into compressPictures newFile id = ${newFile.fd}`);
-          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)}`);
-        }
+        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);
@@ -823,30 +830,37 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
   async getFileInfo(includeBase64: boolean, filePath: string, compressOrTempFilePath: string, exifInfo: Exif): Promise<VideoImageInfo> {
     let videoImageInfo: VideoImageInfo = { duration: null };
     let imageType;
-    let i = this.isNullOrUndefined(compressOrTempFilePath) ? filePath.lastIndexOf('/') : compressOrTempFilePath.lastIndexOf('/')
-    let fileName = this.isNullOrUndefined(compressOrTempFilePath) ? filePath.substring(i + 1) : compressOrTempFilePath.substring(i + 1)
-    i = filePath.lastIndexOf('.')
+
+    const targetFilePath = !this.isNullOrUndefined(compressOrTempFilePath) ? compressOrTempFilePath : filePath;
+
+    let i = targetFilePath.lastIndexOf('/');
+    let fileName = targetFilePath.substring(i + 1);
+    i = targetFilePath.lastIndexOf('.');
     if (i != -1) {
-      imageType = filePath.substring(i + 1)
+      imageType = targetFilePath.substring(i + 1);
     }
-    videoImageInfo.path = this.isNullOrUndefined(compressOrTempFilePath) ? filePrefix + filePath : compressOrTempFilePath + filePath;
+
+    videoImageInfo.path = filePrefix + targetFilePath;
     videoImageInfo.filename = fileName;
     videoImageInfo.mime = 'image/' + imageType;
 
-    let file = fs.openSync(filePath, 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;
     videoImageInfo.creationDate = stat.ctime;
     videoImageInfo.modificationDate = stat.mtime;
-    if (this.isImage(filePath)) {
+
+    if (this.isImage(targetFilePath)) {
       let imageIS = image.createImageSource(file.fd)
       let imagePM = await imageIS.createPixelMap()
       let imgInfo = await imagePM.getImageInfo();
-      videoImageInfo.data = includeBase64 ? this.imageToBase64(compressOrTempFilePath || filePath) : null;
+     
+      videoImageInfo.data = includeBase64 ? this.imageToBase64(targetFilePath) : null;
       videoImageInfo.height = imgInfo.size.height;
       videoImageInfo.width = imgInfo.size.width;
       videoImageInfo.exif = exifInfo;
+
       imagePM.release().then(() => {
         imagePM = undefined;
       })
@@ -892,6 +906,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
       const showCropGuidelines: boolean = this.isNullOrUndefined(options?.showCropGuidelines) ? true : options?.showCropGuidelines;
       const showCropFrame: boolean = this.isNullOrUndefined(options?.showCropFrame) ? true : options?.showCropFrame;
       const freeStyleCropEnabled: boolean = this.isNullOrUndefined(options?.freeStyleCropEnabled) ? false : options?.freeStyleCropEnabled;
+      const cropperCircleOverlay: boolean = this.isNullOrUndefined(options?.cropperCircleOverlay) ? false : options?.cropperCircleOverlay;
       const cropperRotate: string = options?.cropperRotateButtonsHidden + '';
       AppStorage.setOrCreate('initWidth', initWidth);
       AppStorage.setOrCreate('initHeight', initHeight);
@@ -905,7 +920,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
       AppStorage.setOrCreate('showCropGuidelines', showCropGuidelines);
       AppStorage.setOrCreate('showCropFrame', showCropFrame);
       AppStorage.setOrCreate('freeStyleCropEnabled', freeStyleCropEnabled);
-
+      AppStorage.setOrCreate('cropperCircleOverlay', cropperCircleOverlay);
       try {
         let want: Want = {
           "bundleName": bundleName,

package/harmony/image_crop_picker/src/main/ets/generated/components/ts.ts

@@ -2,4 +2,4 @@
 /**
  */
 
-export {}
+export {}

package/harmony/image_crop_picker/src/main/ets/generated/turboModules/ImageCropPicker.ts

@@ -2,6 +2,8 @@
  * This code was generated by "react-native codegen-lib-harmony"
  */
 
+import { Tag } from "@rnoh/react-native-openharmony/ts"
+
 export namespace ImageCropPicker {
   export const NAME = 'ImageCropPicker' as const