@react-native-ohos/react-native-image-crop-picker 0.51.2-rc.4 → 0.51.2-rc.6

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## 鸿蒙化Log
 
+### v0.51.2-rc.6
+
+- fix: Adjust the saved format after image cropping and compression
+- pre-release: @react-native-ohos/react-native-image-crop-picker@0.51.2-rc.6
+
+### v0.51.2-rc.5
+
+- fix: Add the "freeStyleCropEnabled" attribute
+- pre-release: @react-native-ohos/react-native-image-crop-picker@0.51.2-rc.5
+
 ### v0.51.2-rc.4
 
 - Fix: Support for multiple image formats in image compression. Fixed issues with openPicker and openCamera where circular cropping of images did not display properly.

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.4",
+  "version": "0.51.2-rc.6",
   "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

@@ -698,40 +698,17 @@ 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);
-        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);
-          // 只取第一帧压缩 同时将图片转为jpeg来处理压缩
-          let packerData = await packer.packToData(pixelMapList[0], options);
-          const number = fs.writeSync(newFile.fd, packerData);
-          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);
-        }
+        let options: image.PackingOption = {
+          format: `image/jpeg`,
+          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 {

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

@@ -1252,7 +1252,9 @@ export struct ImageEditInfo {
         return;
       }
       this.imageFlag = false;
-
+      if (!this.freeStyleCropEnabled) {
+        return;
+      }
       let touch = event.touches[0];
       let delX: number = touch.screenX - this.dragObj.x;
       let delY: number = touch.screenY - this.dragObj.y;

package/harmony/image_crop_picker/src/main/ets/utils/EncodeUtil.ets

@@ -30,50 +30,22 @@ import util from '@ohos.util';
 
 const TAG: string = 'imageEdit_Encode';
 
-
 export async function encode(component: Object, pixelMap: ESObject) : Promise<string> {
+  let imgPath: string = '';
   const newPixelMap: ESObject = pixelMap;
   const imagePackerApi = image.createImagePacker();
-  let imagePath = AppStorage.get('filePath') as string;
-
-  let i = imagePath.lastIndexOf('.');
-  let imageType = 'jpg';
-  if (i != -1) {
-    imageType = imagePath.substring(i + 1);
-  }
-  let jpgToJpeg = (imageType == 'jpg' ? 'jpeg' : imageType);
-  if (imageType == 'bmp') {
-    jpgToJpeg = 'jpeg';
+  const packOptions: image.PackingOption = {
+    format: Constants.ENCODE_FORMAT,
+    quality: Constants.ENCODE_QUALITY
   }
+  let packerData = await imagePackerApi.packing(newPixelMap, packOptions);
   const context = getContext(component);
-  let dstPath = context.tempDir + '/rn_image_crop_picker_lib_temp_' + util.generateRandomUUID(true) + '.' + imageType;
-  if (imageType == 'gif') {
-    let options: image.PackingOption = {
-      format: `image/jpeg`,
-      quality: 100,
-    };
-    let newFile = fs.openSync(dstPath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
-    let packerData = await imagePackerApi.packToData(newPixelMap, options);
-    const number = fs.writeSync(newFile.fd, packerData);
-    fs.closeSync(newFile);
-  } else {
-    let quality = Constants.ENCODE_QUALITY;
-    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(newPixelMap, options);
-    const number = fs.writeSync(newFile.fd, packerData);
-    fs.closeSync(newFile);
-  }
+  imgPath = context.tempDir + '/rn_image_crop_picker_lib_temp_' + util.generateRandomUUID(true) + Constants.IMAGE_FORMAT;
+  let newFile = fs.openSync(imgPath, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
+  const number = fs.writeSync(newFile.fd, packerData);
+  fs.closeSync(newFile.fd);
   imagePackerApi.release();
-  return dstPath;
+  return imgPath;
 }
 
 // PNG编码函数

package/package.json

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