change version

Author: houningjuanNew

harmony/image_editor.har

@@ -23,13 +23,13 @@
 #### **npm**
 
 ```bash
-npm install @react-native-oh-tpl/image-editor
+npm install @react-native-oh-tpl/image-editor@file:#
 ```
 
 #### **yarn**
 
 ```bash
-yarn add @react-native-oh-tpl/image-editor
+yarn add @react-native-oh-tpl/image-editor@file:#
 ```
 
 
@@ -68,7 +68,7 @@ ImageEditor.cropImage(uri, cropData).then((result) => {
 ```json
 "dependencies": {
     "rnoh": "file:../rnoh",
-    "rnoh-xxx": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor.har"
+    "rnoh-image-editor": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor.har"
   }
 ```
 
@@ -90,7 +90,7 @@ ohpm install
 ```json
 "dependencies": {
     "rnoh": "file:../rnoh",
-    "rnoh-xxx": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor"
+    "rnoh-image-editor": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor"
   }
 ```
 
@@ -101,7 +101,7 @@ cd entry
 ohpm install --no-link
 ```
 
-### 配置 CMakeLists 和引入 xxxPackge
+### 配置 CMakeLists 和引入ImageEditorPackage
 
 打开 `entry/src/main/cpp/CMakeLists.txt`，添加：
 

harmony/image_editor/README.md

@@ -1,6 +1,6 @@
 {
   "name": "rnoh-image-editor",
-  "version": "1.0.0",
+  "version": "3.2.0-0.0.1",
   "description": "Please describe the basic information.",
   "main": "index.ets",
   "author": "",

harmony/image_editor/oh-package.json5

@@ -62,72 +62,58 @@ interface EditorResult {
   base64?: string
 }
 
-const context = getContext(this) as common.ApplicationContext
-
-let newOptions: ImageCropData = {
-  offset: {x: 0, y: 0},
-  size: {width: 0, height: 0},
-  resizeMode: 'cover',
-  includeBase64: false,
-}
-
-let resizeScaleSize: size = {
-  width: 0,
-  height: 0
-}
-
 async function loadBase(uri: string) {
   return new Promise((resolve)=>{
     let buf = buffer.alloc(uri.length, uri)
     resolve(buf.buffer)
   })
 }
+
 function loadHttp(uri: string)  {
   return new Promise((resolve, reject)=>{
     http.createHttp().request(uri,{
       header: {
         'Content-Type': 'application/octet-stream'
       }
     },
-    async (error: BusinessError, data: http.HttpResponse) => {
-      let code: http.ResponseCode | number = data.responseCode
-      if (ResponseCode.ResponseCode.OK === code) {
-        const imageData = data.result as ArrayBuffer
-        Logger.info("http.createHttp success")
-        resolve(imageData)
-      } else {
-        Logger.error("http.createHttp error is " + error)
-      }
-    })
+      async (error: BusinessError, data: http.HttpResponse) => {
+        let code: http.ResponseCode | number = data.responseCode
+        if (ResponseCode.ResponseCode.OK === code) {
+          const imageData = data.result as ArrayBuffer
+          Logger.info("http.createHttp success")
+          resolve(imageData)
+        } else {
+          Logger.error("http.createHttp error is " + error)
+        }
+      })
   })
 }
 
-async function getUriBuffer(uri: string) {
-  let imageBuffer = null
+async function imageEditor(newOptions:ImageCropData, uri: string): Promise<EditorResult> {
+  let imageData = null
+  let openFile = null
   if(uri.startsWith("data:")){
-    imageBuffer = await loadBase(uri)
+    imageData = await loadBase(uri)
   } else if(uri.startsWith('http')) {
-    imageBuffer = await loadHttp(uri)
+    imageData = await loadHttp(uri)
   } else {
-    imageBuffer = uri
+    openFile = fs.openSync(uri, fs.OpenMode.READ_ONLY)
+    imageData = openFile.fd
   }
-  return imageBuffer
-}
 
-async function imageEditor(imageData): Promise<EditorResult> {
   let imageSourceApi: image.ImageSource = image.createImageSource(imageData)
   let getImageInfo: image.ImageInfo
   let options: Record<string, number | boolean> = {
     'editable': true,
   }
-  let editorPM = await imageSourceApi.createPixelMap(options)  
+  let editorPM = await imageSourceApi.createPixelMap(options)
 
   editorPM.getImageInfo().then((imageInfo: image.ImageInfo) => {
-		if(newOptions.offset.x+newOptions.size.width > imageInfo.size.width || newOptions.offset.y+newOptions.size.height > imageInfo.size.height){
+    if(newOptions.offset.x+newOptions.size.width > imageInfo.size.width || newOptions.offset.y+newOptions.size.height > imageInfo.size.height){
       Logger.error('[RNOH]:The cropped size exceeds the original size')
       return
     }
-	})
+  })
 
   const x = newOptions.offset.x
   const y = newOptions.offset.y
@@ -136,24 +122,24 @@ async function imageEditor(imageData): Promise<EditorResult> {
   let region: image.Region = { x, y, size: {height, width}}
 
   await editorPM.crop(region).then(() => {
-      Logger.info('imageEditor.Succeeded in crop.');
-    }).catch((error: BusinessError) => {
-      Logger.error('imageEditor.Failed to crop.');
-    })
+    Logger.info('imageEditor.Succeeded in crop.')
+  }).catch((error: BusinessError) => {
+    Logger.error('imageEditor.Failed to crop.')
+  })
 
   if(newOptions.displaySize && newOptions.displaySize.width && newOptions.displaySize.height){
-
     const cropSize = newOptions.size
     const displaySize = JSON.parse(JSON.stringify(newOptions.displaySize))
     const aspect = cropSize.width / cropSize.height
     const targetAspect = displaySize.width / displaySize.height
     if(aspect === targetAspect) newOptions.resizeMode = 'stretch'
-    
+
     const xRatio = displaySize.width / cropSize.width
     const yRatio = displaySize.height / cropSize.height
     if(newOptions.resizeMode === 'stretch'){
       await editorPM.scale(xRatio, yRatio)
     } else if(newOptions.resizeMode === 'cover'){
+      let resizeScaleSize: size = displaySize
       if(displaySize.width !== cropSize.width || displaySize.height !== cropSize.height){
         const ratio = Math.max(xRatio, yRatio)
         await editorPM.scale(ratio, ratio)
@@ -163,40 +149,42 @@ async function imageEditor(imageData): Promise<EditorResult> {
         })
       }
 
-      const targetRegion = await TargetRect()
+      const targetRegion = await TargetRect(newOptions, resizeScaleSize)
       await editorPM.crop(targetRegion).then(() => {
-        Logger.info('imageEditor.Succeeded in crop.');
+        Logger.info('imageEditor.Succeeded in crop.')
       }).catch((error: BusinessError) => {
-        Logger.error('imageEditor.Failed to crop.');
+        Logger.error('imageEditor.Failed to crop.')
       })
-
     } else {
-      const { size } = await TargetRect()
+      const { size } = await TargetRect(newOptions)
       const xRatio = size.width / cropSize.width
       const yRatio = size.height / cropSize.height
       await editorPM.scale(xRatio, yRatio)
     }
-    
   }
   await editorPM.getImageInfo().then((imageInfo: image.ImageInfo) => {
-		getImageInfo = imageInfo
-	})
-
+    getImageInfo = imageInfo
+  })
+  let context = getContext(this) as common.ApplicationContext
   let suffix = newOptions.format
   suffix = suffix === 'jpeg' || suffix === 'jpg' ? 'jpeg' : suffix
   const fileName = `ReactNative_cropped_image_${new Date().getTime()}.${suffix==='jpeg'?'jpg':suffix}`
   const path: string = `${context.cacheDir}/${fileName}`
   let packOpts: image.PackingOption = { format: `image/${suffix}`, quality: newOptions.quality || 90 }
-  let file = await fs.openSync(path, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
   let size = 0
   let base64Data = ''
 
   const imagePackerApi:image.ImagePacker = image.createImagePacker()
   await imagePackerApi.packing(editorPM, packOpts)
     .then(async (data: ArrayBuffer) => {
-      let writeLen = await fs.writeSync(file.fd, data)
-      size = writeLen
-      fs.closeSync(file)
+      let file = fs.openSync(path, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE)
+      try {
+        size = fs.writeSync(file.fd, data)
+      } catch(err) {
+        Logger.error('file write failed')
+      } finally {
+        fs.closeSync(file)
+      }
 
       if(newOptions.includeBase64){
         let unit8Array: Uint8Array = new Uint8Array(data)
@@ -205,14 +193,15 @@ async function imageEditor(imageData): Promise<EditorResult> {
       }
 
     }).catch((error: BusinessError) => {
-      Logger.error('packing failed.');
+      Logger.error('packing failed.')
+    }).finally(() => {
+      openFile && fs.closeSync(openFile)
     })
 
   editorPM.release()
   imageSourceApi.release()
   imagePackerApi.release()
-
-  size = await fs.statSync(path).size;
+  context = null
 
   const result:EditorResult = {
     uri: `file://${path}`,
@@ -226,10 +215,10 @@ async function imageEditor(imageData): Promise<EditorResult> {
   if(newOptions.includeBase64){
     result.base64 = base64Data
   }
-  return result;
+  return result
 }
 
-async function TargetRect() {
+async function TargetRect(newOptions: ImageCropData, resizeScaleSize?: size) {
   const resizeMode = newOptions.resizeMode
   const cropSize = newOptions.size
   const displaySize = JSON.parse(JSON.stringify(newOptions.displaySize))
@@ -255,17 +244,18 @@ async function TargetRect() {
       targetSize.height = displaySize.height
       targetSize.width = Math.ceil(targetSize.height * aspect)
     }
+    targetRegion.size = targetSize
   } else if(resizeMode === 'center') {
     if(cropSize.height > displaySize.height) {
       targetSize.width = displaySize.width
       targetSize.height = Math.ceil(targetSize.width / aspect)
-    } 
+    }
     if(cropSize.width > displaySize.width) {
       targetSize.height = displaySize.height
       targetSize.width = Math.ceil(targetSize.height * aspect)
     }
+    targetRegion.size = targetSize
   }
-  targetRegion.size = targetSize
   return targetRegion
 }
 
@@ -278,18 +268,18 @@ export class ImageEditorModule extends TurboModule {
       quality = Math.floor(options.quality * 100)
     }
     if(!uri){
-      Logger.warn('[RNOH]:Please specify a URI');
+      Logger.warn('[RNOH]:Please specify a URI')
       return
     }
     if(!offset || !size || !('x' in offset) || !('y' in offset) || !size.width || !size.height){
-      Logger.warn('[RNOH]:Please specify offset and size');
+      Logger.warn('[RNOH]:Please specify offset and size')
       return
     }
     if(quality > 100 || quality < 0){
-      Logger.warn('[RNOH]:quality must be a number between 0 and 1');
+      Logger.warn('[RNOH]:quality must be a number between 0 and 1')
       return
     }
-
+    let newOptions: ImageCropData = options
     newOptions.size = size
     newOptions.offset = offset
     newOptions.quality = quality
@@ -303,10 +293,7 @@ export class ImageEditorModule extends TurboModule {
     }
     if(options.includeBase64) newOptions.includeBase64 = options.includeBase64
 
-    const buffer = await getUriBuffer(uri)
-    const fileUri: EditorResult = await imageEditor(buffer)
-
+    const fileUri: EditorResult = await imageEditor(newOptions, uri)
     return fileUri.uri
-
   }
-}
+}

harmony/image_editor/src/main/ets/ImageEditorModule.ts

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-oh-tpl/image-editor",
-  "version": "3.2.0",
+  "version": "3.2.0-0.0.1",
   "description": "React Native Image Editing native modules for iOS & Android & Harmony",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",