@tarojs/plugin-platform-harmony-ets 4.0.0-beta.112 → 4.0.0-beta.114

package/dist/apis/media/image/index.ts

@@ -12,10 +12,11 @@
 import fs from '@ohos.file.fs'
 import picker from '@ohos.file.picker'
 import image from '@ohos.multimedia.image'
+import { Current } from '@tarojs/runtime'
 import { isNull } from '@tarojs/shared'
 
-import { callAsyncFail, callAsyncSuccess, requestPermissions, temporarilyNotSupport, validateParams } from '../../utils'
-import { READ_IMAGEVIDEO_PERMISSIONS } from '../../utils/permissions'
+import { getSystemInfoSync } from '../../base'
+import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
 
 import type Taro from '@tarojs/taro/types'
 
@@ -30,7 +31,7 @@ interface IChooseImageData {
   tempFiles?: {
     path: string
     size: number
-  }
+  }[]
 }
 
 const getImageInfoSchema = {
@@ -78,12 +79,18 @@ class CompressedImageInfo {
 }
 
 async function saveImage(compressedImageData, compressedImageUri) {
-  // 定义要保存的压缩图片uri。afterCompressiona.jpeg表示压缩后的图片。
+  const tempArr = compressedImageUri.split('/')
+  const name = tempArr[tempArr.length - 1]
+  const context = getContext(Current?.page)
+  const applicationContext = context.getApplicationContext()
+  const tempDir = applicationContext.tempDir
+  const filePath = `${tempDir}/${name}`
+
   try {
-    const res = fs.accessSync(compressedImageUri)
+    const res = fs.accessSync(filePath)
     if (res) {
       // 如果图片afterCompressiona.jpeg已存在，则删除
-      fs.unlinkSync(compressedImageUri)
+      fs.unlinkSync(filePath)
     }
   } catch (err) {
     console.error(`[Taro] saveImage Error: AccessSync failed with error message: ${err.message}, error code: ${err.code}`)
@@ -91,13 +98,13 @@ async function saveImage(compressedImageData, compressedImageUri) {
 
   // 知识点：保存图片。获取最终图片压缩数据compressedImageData，保存图片。
   // 压缩图片数据写入文件
-  const file = fs.openSync(compressedImageUri, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE)
+  const file = fs.openSync(filePath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE)
   fs.writeSync(file.fd, compressedImageData)
   fs.closeSync(file)
 
   // 获取压缩图片信息
   const compressedImageInfo = new CompressedImageInfo()
-  compressedImageInfo.imageUri = compressedImageUri
+  compressedImageInfo.imageUri = filePath
   compressedImageInfo.imageByteLength = compressedImageData.byteLength
 
   return compressedImageInfo
@@ -105,83 +112,143 @@ async function saveImage(compressedImageData, compressedImageUri) {
 
 export const compressImage: typeof Taro.compressImage = function (options) {
   return new Promise((resolve, reject) => {
-    requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
-      try {
-        validateParams('compressImage', options, compressImageSchema)
-      } catch (error) {
-        const res = { errMsg: error.message }
-        return callAsyncFail(reject, res, options)
-      }
-      const { src, quality = 80 } = options
-      const srcAfterCompress = src.split('.').join('_after_compress.')
-      const file = fs.openSync(src, fs.OpenMode.READ_ONLY)
-
-      // const stat = fs.statSync(file.fd)
-      // console.log('[Taro] 压缩前图片的大小为：', stat.size)
-
-      const source = image.createImageSource(file.fd)
-      if (isNull(source)) {
-        const createImageSourceError = { errMsg: 'compressImage fail: createImageSource has failed.' }
-        callAsyncFail(reject, createImageSourceError, options)
-        return
-      }
+    try {
+      validateParams('compressImage', options, compressImageSchema)
+    } catch (error) {
+      const res = { errMsg: error.message }
+      return callAsyncFail(reject, res, options)
+    }
+    const { src, quality = 80, compressedWidth, compressedHeight } = options
+    const srcAfterCompress = src.includes('_after_compress') ? src : src.split('.').join('_after_compress.')
+    const file = fs.openSync(src, fs.OpenMode.READ_ONLY)
 
-      const packer = image.createImagePacker(file.fd)
-      if (isNull(packer)) {
-        const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' }
-        callAsyncFail(reject, createImagePackerError, options)
-      }
+    // const stat = fs.statSync(file.fd)
+    // console.log('[Taro] 压缩前图片的大小为：', stat.size)
 
-      const packingOptionsOHOS: IPackingOptionOHOS = {
-        // TODO：需要获取文件名后缀
-        format: 'image/jpeg',
-        quality: quality
-      }
-      packer.packing(source, packingOptionsOHOS).then((value) => {
-        saveImage(value, srcAfterCompress).then(result => {
-          callAsyncSuccess(resolve, { tempFilePath: result.imageUri }, options)
-        })
-      }).catch((error) => {
-        callAsyncFail(reject, error, options)
-      })
+    const source = image.createImageSource(file.fd)
+    if (isNull(source)) {
+      const createImageSourceError = { errMsg: 'compressImage fail: createImageSource has failed.' }
+      callAsyncFail(reject, createImageSourceError, options)
+      return
+    }
 
-      fs.closeSync(file)
-    }, (error: string) => {
-      const res = { errMsg: error }
-      return callAsyncFail(reject, res, options)
+    const width = source.getImageInfoSync().size.width
+    const height = source.getImageInfoSync().size.height
+    let wantWidth = compressedWidth || compressedHeight || 0
+    let wantHeight = compressedHeight || compressedWidth || 0
+
+    if (width > wantWidth || height > wantHeight) {
+      const heightRatio = height / wantHeight
+      const widthRatio = width / wantWidth
+      const finalRatio = heightRatio < widthRatio ? heightRatio : widthRatio
+
+      wantWidth = Math.round(width / finalRatio)
+      wantHeight = Math.round(height / finalRatio)
+    }
+
+    const decodingOptions = {
+      editable: true,
+      desiredPixelFormat: image.PixelMapFormat.RGBA_8888,
+      desiredSize: { width: wantWidth, height: wantHeight }
+    }
+    source.createPixelMap(decodingOptions, (error, pixelMap) => {
+      if (error !== undefined) {
+        fs.closeSync(file)
+        const res = { errMsg: error }
+        callAsyncFail(reject, res, options)
+      } else {
+        const packer = image.createImagePacker(file.fd)
+        if (isNull(packer)) {
+          fs.closeSync(file)
+          const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' }
+          callAsyncFail(reject, createImagePackerError, options)
+          return
+        }
+
+        const isPNG = src.endsWith('.png')
+        const packingOptionsOHOS: IPackingOptionOHOS = {
+          format: isPNG ? 'image/png' : 'image/jpeg',
+          quality: quality
+        }
+        packer.packing(pixelMap, packingOptionsOHOS).then((value) => {
+          fs.closeSync(file)
+          saveImage(value, srcAfterCompress).then(result => {
+            callAsyncSuccess(resolve, { tempFilePath: result.imageUri }, options)
+          })
+        }).catch((error) => {
+          fs.closeSync(file)
+          callAsyncFail(reject, error, options)
+        })
+      }
     })
   })
 }
 
 export const chooseImage: typeof Taro.chooseImage = function (options) {
   return new Promise((resolve, reject) => {
-    requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
-      try {
-        validateParams('chooseImage', options, chooseImageSchema)
-      } catch (error) {
-        const res = { errMsg: error.message }
-        return callAsyncFail(reject, res, options)
-      }
+    try {
+      validateParams('chooseImage', options, chooseImageSchema)
+    } catch (error) {
+      const res = { errMsg: error.message }
+      return callAsyncFail(reject, res, options)
+    }
 
-      const { count = 9 } = options
-      const photoViewPicker = new picker.PhotoViewPicker()
-      let sizeType = options.sizeType
+    const { count = 9 } = options
+    const photoViewPicker = new picker.PhotoViewPicker()
+    let sizeType = options.sizeType
 
-      if (!sizeType || !sizeType.length) {
-        sizeType = ['compressed', 'original']
-      }
+    if (!sizeType || !sizeType.length) {
+      sizeType = ['compressed', 'original']
+    }
+
+    photoSelectOptions.maxSelectNumber = count // 选择媒体文件的最大数目
+    photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE // 过滤选择媒体文件类型为IMAGE
+
+    photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
+      const result: IChooseImageData = {}
+      const isOrigin = photoSelectResult.isOriginalPhoto
+
+      if (isOrigin) {
+        const tempFilePaths: string[] = []
+        const tempFiles = photoSelectResult.photoUris.map(uri => {
+          const file = fs.openSync(uri, fs.OpenMode.READ_ONLY)
+          const stat = fs.statSync(file.fd)
+          const size = stat.size
 
-      photoSelectOptions.maxSelectNumber = count // 选择媒体文件的最大数目
-      photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE // 过滤选择媒体文件类型为IMAGE
+          fs.closeSync(file)
+          tempFilePaths.push(uri)
 
-      photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
-        const result: IChooseImageData = {}
+          return {
+            size,
+            path: uri,
+          }
+        })
+
+        result.tempFiles = tempFiles
+        result.tempFilePaths = tempFilePaths
+
+        callAsyncSuccess(resolve, result, options)
+      } else {
+        const actions: Promise<string>[] = photoSelectResult.photoUris.map(uri => {
+          return new Promise<string>(resolve => {
+            compressImage({
+              src: uri,
+              compressedWidth: getSystemInfoSync().screenWidth / 2,
+              compressedHeight: getSystemInfoSync().screenHeight / 2,
+              success: (compressResult) => {
+                resolve(compressResult.tempFilePath)
+              }
+            })
+          })
+        })
 
-        if (sizeType.includes('original')) {
-          const tempFiles = photoSelectResult.photoUris.map(uri => {
+        Promise.all(actions).then(tempFilePaths => {
+          const tempFiles = tempFilePaths.map(uri => {
             const file = fs.openSync(uri, fs.OpenMode.READ_ONLY)
             const stat = fs.statSync(file.fd)
-            const size = stat.size
+            const size: number = stat.size
+
+            fs.closeSync(file)
 
             return {
               size,
@@ -189,37 +256,17 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
             }
           })
 
+          result.tempFilePaths = tempFilePaths
           result.tempFiles = tempFiles
-        }
-
-        if (sizeType.includes('compressed')) {
-          const actions: Promise<string>[] = photoSelectResult.photoUris.map(uri => {
-            return new Promise<string>(resolve => {
-              compressImage({
-                src: uri,
-                success: (compressResult) => {
-                  resolve(compressResult.tempFilePath)
-                }
-              })
-            })
-          })
 
-          Promise.all(actions).then(tempFilePaths => {
-            result.tempFilePaths = tempFilePaths
-            callAsyncSuccess(resolve, result, options)
-          }).catch(error => {
-            const res = { errMsg: error }
-            return callAsyncFail(reject, res, options)
-          })
-        } else {
           callAsyncSuccess(resolve, result, options)
-        }
-      }).catch((error) => {
-        callAsyncFail(reject, error, options)
-      })
-    }, (error: string) => {
-      const res = { errMsg: error }
-      return callAsyncFail(reject, res, options)
+        }).catch(error => {
+          const res = { errMsg: error }
+          return callAsyncFail(reject, res, options)
+        })
+      }
+    }).catch((error) => {
+      callAsyncFail(reject, error, options)
     })
   })
 }

package/dist/apis/utils/permissions.ts

@@ -1 +1,6 @@
 export const READ_IMAGEVIDEO_PERMISSIONS = 'ohos.permission.READ_IMAGEVIDEO'
+export const READ_MEDIA_PERMISSIONS = 'ohos.permission.READ_MEDIA'
+export const WRITE_MEDIA_PERMISSIONS = 'ohos.permission.WRITE_MEDIA'
+export const MEDIA_LOCATION_PERMISSIONS = 'ohos.permission.MEDIA_LOCATION'
+
+export const IMAGE_PERMISSION = [READ_IMAGEVIDEO_PERMISSIONS, READ_MEDIA_PERMISSIONS, WRITE_MEDIA_PERMISSIONS, MEDIA_LOCATION_PERMISSIONS]

package/dist/runtime-ets/dom/element/movableView.ts

@@ -231,14 +231,18 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
   public callTouchEventFnFromGesture(eventName: string, gestureEvent: GestureEvent) {
     const touchFns = (this?.__listeners?.[eventName] || []) as Function[]
     touchFns.forEach(fn => {
-      fn({
-        _hmEvent: gestureEvent,
-        target: this,
-        changedTouches: gestureEvent.fingerList.map(finger => ({
-          clientX: finger.globalX,
-          clientY: finger.globalY
-        }))
-      })
+      try {
+        fn({
+          _hmEvent: gestureEvent,
+          target: this,
+          changedTouches: gestureEvent.fingerList.map(finger => ({
+            clientX: finger.globalX,
+            clientY: finger.globalY
+          }))
+        })
+      } catch (error) {
+        console.error(error)
+      }
     })
   }
 }

package/dist/runtime-ets/dom/stylesheet/type.ts

@@ -38,10 +38,10 @@ export interface TaroStyleType {
 
   // position
   position?: 'relative' | 'absolute' | 'fixed'
-  top?: Length
-  left?: Length
-  bottom?: Length
-  right?: Length
+  top?: Dimension
+  left?: Dimension
+  bottom?: Dimension
+  right?: Dimension
 
   // flex
   flexBasis?: number | string