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

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 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/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.2',
   dependencies: {
     "@rnoh/react-native-openharmony": "^0.72.38"
   },

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

@@ -823,30 +823,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;
       })

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

@@ -129,6 +129,7 @@ export struct ImageEditInfo {
   private minSize = PHONE_MIN_CROP // 最小宽高
   private dragObj: DragObj = new DragObj(false);
   private clb: number = 1
+  private canClip: boolean = true
 
   pixelInit(path: string) {
     this.angle = 0;
@@ -180,6 +181,9 @@ export struct ImageEditInfo {
       top = (screenHeight - this.initHeight) / 2 - 66;
       bottom = this.initHeight + top;
     }
+    if(!!this.initWidth && !!this.initHeight){
+      this.canClip = false
+    }
 
     this.clipSize = new Rectangle(left, top, right, bottom);
     this.display = new Rectangle(0, 0, this.screenWidth, this.screenHeight - 66 * 2);
@@ -559,6 +563,9 @@ export struct ImageEditInfo {
       let newPosition = this.clipSize.clone();
 
       let direction = this.dragObj.action;
+
+      if(!this.canClip) return;
+      
       if (this.dragObj.multiCrop) {
         this.getMultiCropRect(delX, delY, newPosition, direction, event.pressure);
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@react-native-ohos/react-native-image-crop-picker",
-	"version": "0.40.4",
+	"version": "0.40.5-rc.2",
 	"description": "Select single or multiple images, with cropping option",
 	"main": "js/index.js",
 	"scripts": {