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

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 鸿蒙化Log
 
+### v0.50.2
+
+- release: @react-native-ohos/react-native-image-crop-picker@0.50.2
+
 ### v0.50.2-rc.6
 
 - pre-release: @react-native-ohos/react-native-image-crop-picker@0.50.2-rc.6

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.50.2-rc.6",
+  "version": "0.50.2",
   "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/pages/ImageEditInfo.ets

@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 import image from '@ohos.multimedia.image';
 import Logger from '../Logger';
 import display from '@ohos.display';
@@ -191,14 +192,13 @@ export struct ImageEditInfo {
 
     this.maxClipSize = new Rectangle(left, top, right, bottom);
 
-    if (this.initWidth > 0 && this.initHeight > 0) {
-      let flag = imageWidth/this.initWidth < imageHeight/this.initHeight;
-      let _imgWidth = flag ? imgWidth : Math.round(imgHeight * this.initWidth / this.initHeight)
-      let _imgHeight = !flag ? imgHeight : Math.round(imgWidth * this.initHeight / this.initWidth)
-      left = (screenWidth - _imgWidth) / 2;
-      right = _imgWidth + left;
-      top = (screenHeight - _imgHeight) / 2 - 66;
-      bottom = _imgHeight + top;
+    if (this.initWidth > 0) {
+      left = (screenWidth - this.initWidth) / 2;
+      right = this.initWidth + left;
+    }
+    if (this.initHeight > 0) {
+      top = (screenHeight - this.initHeight) / 2 - 66;
+      bottom = this.initHeight + top;
     }
 
     this.clipSize = new Rectangle(left, top, right, bottom);
@@ -227,10 +227,9 @@ export struct ImageEditInfo {
       .fontSize(20)
       .textAlign(TextAlign.Center)
       .width('100%')
-      .height(66)
-      .position({ x: 0, y: 0 })
+      .height(46)
+      .position({ x: 0, y: 20 })
       .backgroundColor(Color.Black)
-      .padding({top:32})
   }
 
   @Builder
@@ -384,20 +383,17 @@ export struct ImageEditInfo {
             let region: image.Region = { x: 0, y: 0, size: { height: cropHeight, width: cropWidth } };
             region.x =
               (this.clipSize.left - this.maxClipSize.left) / this.imgScale * this.clb + (xOff / this.imgScale) - this.imgOffSetX / this.imgScale * this.clb;
-            region.size.width = Math.round(cropWidth - region.x - (this.maxClipSize.right - this.clipSize.right) / this.imgScale * this.clb
-              - (xOff / this.imgScale) - this.imgOffSetX / this.imgScale * this.clb);
+            region.size.width = cropWidth - region.x - (this.maxClipSize.right - this.clipSize.right) / this.imgScale * this.clb
+              - (xOff / this.imgScale) - this.imgOffSetX / this.imgScale * this.clb;
             region.y =
               (this.clipSize.top - this.maxClipSize.top) / this.imgScale * this.clb + (yOff / this.imgScale) - this.imgOffSetY / this.imgScale * this.clb;
-            region.size.height = Math.round(cropHeight - region.y - (this.maxClipSize.bottom - this.clipSize.bottom) / this.imgScale * this.clb
-              - (yOff / this.imgScale) - this.imgOffSetY / this.imgScale * this.clb);
+            region.size.height = cropHeight - region.y - (this.maxClipSize.bottom - this.clipSize.bottom) / this.imgScale * this.clb
+              - (yOff / this.imgScale) - this.imgOffSetY / this.imgScale * this.clb;
             this.icon.crop(region, async (err: BusinessError) => {
               if (err != undefined) {
                 console.error("Failed to crop pixelmap.");
                 return;
               } else {
-                if (this.initWidth > 0 && this.initHeight > 0){
-                  this.icon?.scaleSync( this.initWidth / region.size.width, this.initHeight / region.size.height )
-                }
                 let imgPath = await encode(this, this.icon);
                 AppStorage.setOrCreate('cropImagePath', imgPath)
                 AppStorage.setOrCreate('cropRect', {
@@ -413,7 +409,7 @@ export struct ImageEditInfo {
         })
     }
     .width('100%')
-    .height(66)
+    .height(56)
     .position({ x: 0, y: (this.screenHeight - 66) })
     .backgroundColor(Color.Black)
   }
@@ -572,7 +568,7 @@ export struct ImageEditInfo {
         return;
       }
       this.imageFlag = false;
-      if (!this.freeStyleCropEnabled) {
+      if (this.freeStyleCropEnabled) {
         return;
       }
       let touch = event.touches[0];
@@ -583,7 +579,6 @@ export struct ImageEditInfo {
       let newPosition = this.clipSize.clone();
 
       let direction = this.dragObj.action;
-
       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.50.2-rc.6",
+	"version": "0.50.2",
 	"description": "Select single or multiple images, with cropping option",
 	"main": "js/index.js",
 	"scripts": {
@@ -34,7 +34,7 @@
 		"react-native-image-crop-picker": "^0.50.1"
 	},
 	"devDependencies": {
-		"@react-native-oh/react-native-harmony-cli": "file:./packages/react-native-oh-react-native-harmony-cli-0.77.18.tgz"
+		"@react-native-oh/react-native-harmony-cli": "file:./packages/rnoh-react-native-harmony-cli-0.77.10.tgz"
 	},
 	"peerDependencies": {
 		"react": "*",