@react-native-ohos/react-native-image-crop-picker 0.51.2-rc.1 → 0.51.2-rc.3

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## 鸿蒙化Log
 
+### v0.51.2-rc.3
+
+- fix: The issue of the PNG image being larger in memory than the one generated with a compression ratio of 0.8 to 1 has been resolved.
+- pre-release: @react-native-ohos/react-native-image-crop-picker@0.51.2-rc.3
+
+### v0.51.2-rc.2
+
+- fix: When canceling the photo selection, do not display an error prompt on the interface.
+- pre-release: @react-native-ohos/react-native-image-crop-picker@0.51.2-rc.2
+
 ### v0.51.2-rc.1
 
 - feat: Updated the synchronization community to version 0.51.1, and modified and added attributes of third-party library components.

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.51.2-rc.1",
+  "version": "0.51.2-rc.3",
   "dependencies": {
     "@rnoh/react-native-openharmony": "file:../../node_modules/@react-native-oh/react-native-harmony/harmony/react_native_openharmony.har"
   },

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

@@ -292,12 +292,12 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
       let sourceFilePaths: Array<string> = result.photoUris as Array<string>;
       if (sourceFilePaths.length < MINIMUM_VALUE) {
         return new Promise(async (res, rej) => {
-          rej('sourceFilePaths is empty')
+          Logger.info(`${TAG} sourceFilePaths is empty`);
         })
       }
       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 {
@@ -356,9 +356,8 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
 
       return this.getPickerResult(options, sourceFilePaths, tempFilePaths);
     } catch (error) {
-      Logger.error(`${TAG} PhotoViewPicker failed err: ${JSON.stringify(error)}`);
       return new Promise(async (res, rej) => {
-        rej('PhotoViewPicker is failed')
+        Logger.error(`${TAG} PhotoViewPicker failed err: ${JSON.stringify(error)}`);
       })
     }
   }
@@ -466,7 +465,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
       } else {
         Logger.info(`${TAG} into getPickerResult video start`);
         let qualityNumber = this.isNullOrUndefined(options.compressImageQuality) ? ImageQuality : options.compressImageQuality;
-        if(qualityNumber !== 1){
+        if(!this.isNullOrUndefined(options.compressImageQuality)){
           results.path = this.isNullOrUndefined(tempFilePaths) ? null : value;
         } else {
           results.path = this.isNullOrUndefined(tempFilePaths) ? null : filePrefix + value;
@@ -562,7 +561,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 {
@@ -622,7 +621,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         }
       } catch (error) {
         let err = error as BusinessError;
-        rej(JSON.stringify(err));
+        Logger.error(JSON.stringify(err));
       }
     })
   };
@@ -692,8 +691,9 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         let imageISs = image.createImageSource(files.fd);
         let imagePMs = await imageISs.createPixelMap();
         let imagePackerApi = await image.createImagePacker();
+        let jpgToJpeg = (imageType == 'jpg' ? 'jpeg':imageType);
         let options: image.PackingOption = {
-          format: 'image/jpeg',
+          format: `image/${jpgToJpeg}`,
           quality: quality,
         };
         try {
@@ -805,7 +805,7 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
     Logger.info(`${TAG} into openCropper imgPath = ${imgPath}`);
     if (this.isNullOrUndefined(imgPath)) {
       return new Promise(async (res, rej) => {
-        rej('imgPath is null')
+        Logger.info(`${TAG} imgPath is null`);
       })
     }
     let tempFilePaths = null;
@@ -1070,9 +1070,9 @@ export class ImageCropPickerTurboModule extends TurboModule implements ImageCrop
         .then((data: PermissionRequestResult) => {
           res(data?.authResults[0] === 0)
         }).catch((err) => {
-          res(false)
-          Logger.info(`${TAG} grantPermission err = ${JSON.stringify(err)}`);
-        })
+        res(false)
+        Logger.info(`${TAG} grantPermission err = ${JSON.stringify(err)}`);
+      })
     });
   }
 }

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

@@ -5,7 +5,7 @@
 export namespace ImageCropPicker {
   export const NAME = 'ImageCropPicker' as const
 
-  export type CropperOptions = {multiple?: boolean, minFiles?: number, maxFiles?: number, waitAnimationEnd?: boolean, smartAlbums?: unknown[], useFrontCamera?: boolean, loadingLabelText?: string, showsSelectedCount?: boolean, sortOrder?: string, hideBottomControls?: boolean, writeTempFile?: boolean, mediaType: string, width?: number, height?: number, includeBase64?: boolean, includeExif?: boolean, forceJpg?: boolean, cropping?: boolean, avoidEmptySpaceAroundImage?: boolean, cropperActiveWidgetColor?: string, cropperStatusBarLight?: boolean, cropperNavigationBarLight?: boolean, cropperToolbarColor?: string, cropperToolbarWidgetColor?: string, cropperToolbarTitle?: string, freeStyleCropEnabled?: boolean, cropperTintColor?: string, cropperCircleOverlay?: boolean, cropperCancelText?: string, cropperCancelColor?: string, cropperChooseText?: string, cropperChooseColor?: string, cropperRotateButtonHidden?: boolean, showCropGuidelines?: boolean, showCropFrame?: boolean, enableRotationGesture?: boolean, disableCropperColorSetters?: boolean, compressImageMaxWidth?: number, compressImageMaxHeight?: number, compressImageQuality?: number, path: string}
+  export type CropperOptions = {multiple?: boolean, minFiles?: number, maxFiles?: number, waitAnimationEnd?: boolean, smartAlbums?: unknown[], useFrontCamera?: boolean, loadingLabelText?: string, showsSelectedCount?: boolean, sortOrder?: string, hideBottomControls?: boolean, writeTempFile?: boolean, mediaType: string, width?: number, height?: number, includeBase64?: boolean, includeExif?: boolean, forceJpg?: boolean, cropping?: boolean, avoidEmptySpaceAroundImage?: boolean, cropperActiveWidgetColor?: string, cropperStatusBarColor?: string, cropperToolbarColor?: string, cropperToolbarWidgetColor?: string, cropperToolbarTitle?: string, freeStyleCropEnabled?: boolean, cropperTintColor?: string, cropperCircleOverlay?: boolean, cropperCancelText?: string, cropperCancelColor?: string, cropperChooseText?: string, cropperChooseColor?: string, cropperRotateButtonHidden?: boolean, showCropGuidelines?: boolean, showCropFrame?: boolean, enableRotationGesture?: boolean, disableCropperColorSetters?: boolean, compressImageMaxWidth?: number, compressImageMaxHeight?: number, compressImageQuality?: number, path: string}
   
   export type Exif = {}
   

package/index.d.ts

@@ -222,20 +222,12 @@ declare module "react-native-image-crop-picker" {
         cropperActiveWidgetColor?: string;
 
         /**
-         * When cropping image, true for light status bar (dark icons), false for dark status bar (light icons).
+         * When cropping image, determines the color of StatusBar.
          *
          * @platform Android only
-         * @default true
-         */
-        cropperStatusBarLight?: boolean;
-
-        /**
-         * When cropping image, true for light navigation bar (dark icons), false for dark navigation bar (light icons).
-         *
-         * @platform Android only
-         * @default false
+         * @default '#424242'
          */
-        cropperNavigationBarLight?: boolean;
+        cropperStatusBarColor?: string;
 
         /**
          * When cropping image, determines the color of Toolbar.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@react-native-ohos/react-native-image-crop-picker",
-	"version": "0.51.2-rc.1",
+	"version": "0.51.2-rc.3",
 	"description": "Select single or multiple images, with cropping option",
 	"main": "js/index.js",
 	"scripts": {
@@ -29,12 +29,12 @@
 	"bugs": {
 		"url": "https://gitcode.com/openharmony-sig/rntpc_react-native-image-crop-picker/issues"
 	},
-	"homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-image-crop-picker/tree/br_rnoh0.77#readme",
+	"homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-image-crop-picker/tree/br_rnoh0.82#readme",
 	"dependencies": {
 		"react-native-image-crop-picker": "^0.51.1"
 	},
 	"devDependencies": {
-		"@react-native-oh/react-native-harmony-cli": "file:./packages/react-native-oh-react-native-harmony-cli-0.82.1.tgz"
+		"@react-native-oh/react-native-harmony-cli": "file:./packages/rnoh-react-native-harmony-cli-0.82.1.tgz"
 	},
 	"peerDependencies": {
 		"react": "*",