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

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

@@ -12,10 +12,12 @@
 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 { getSystemInfoSync } from '../../base'
 import { callAsyncFail, callAsyncSuccess, requestPermissions, temporarilyNotSupport, validateParams } from '../../utils'
-import { READ_IMAGEVIDEO_PERMISSIONS } from '../../utils/permissions'
+import { IMAGE_PERMISSION } from '../../utils/permissions'
 
 import type Taro from '@tarojs/taro/types'
 
@@ -30,7 +32,7 @@ interface IChooseImageData {
   tempFiles?: {
     path: string
     size: number
-  }
+  }[]
 }
 
 const getImageInfoSchema = {
@@ -78,12 +80,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 +99,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,15 +113,15 @@ async function saveImage(compressedImageData, compressedImageUri) {
 
 export const compressImage: typeof Taro.compressImage = function (options) {
   return new Promise((resolve, reject) => {
-    requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
+    requestPermissions(IMAGE_PERMISSION).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 { 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 stat = fs.statSync(file.fd)
@@ -126,26 +134,55 @@ export const compressImage: typeof Taro.compressImage = function (options) {
         return
       }
 
-      const packer = image.createImagePacker(file.fd)
-      if (isNull(packer)) {
-        const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' }
-        callAsyncFail(reject, createImagePackerError, 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 packingOptionsOHOS: IPackingOptionOHOS = {
-        // TODO：需要获取文件名后缀
-        format: 'image/jpeg',
-        quality: quality
+      const decodingOptions = {
+        editable: true,
+        desiredPixelFormat: image.PixelMapFormat.RGBA_8888,
+        desiredSize: { width: wantWidth, height: wantHeight }
       }
-      packer.packing(source, packingOptionsOHOS).then((value) => {
-        saveImage(value, srcAfterCompress).then(result => {
-          callAsyncSuccess(resolve, { tempFilePath: result.imageUri }, options)
-        })
-      }).catch((error) => {
-        callAsyncFail(reject, error, options)
+      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)
+          })
+        }
       })
-
-      fs.closeSync(file)
     }, (error: string) => {
       const res = { errMsg: error }
       return callAsyncFail(reject, res, options)
@@ -155,7 +192,7 @@ export const compressImage: typeof Taro.compressImage = function (options) {
 
 export const chooseImage: typeof Taro.chooseImage = function (options) {
   return new Promise((resolve, reject) => {
-    requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
+    requestPermissions(IMAGE_PERMISSION).then(() => {
       try {
         validateParams('chooseImage', options, chooseImageSchema)
       } catch (error) {
@@ -176,13 +213,18 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
 
       photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
         const result: IChooseImageData = {}
+        const isOrigin = photoSelectResult.isOriginalPhoto
 
-        if (sizeType.includes('original')) {
+        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
 
+            fs.closeSync(file)
+            tempFilePaths.push(uri)
+
             return {
               size,
               path: uri,
@@ -190,13 +232,16 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
           })
 
           result.tempFiles = tempFiles
-        }
+          result.tempFilePaths = tempFilePaths
 
-        if (sizeType.includes('compressed')) {
+          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)
                 }
@@ -205,14 +250,27 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
           })
 
           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: number = stat.size
+
+              fs.closeSync(file)
+
+              return {
+                size,
+                path: uri,
+              }
+            })
+
             result.tempFilePaths = tempFilePaths
+            result.tempFiles = tempFiles
+
             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)

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/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

package/dist/runtime-utils.js

@@ -2280,6 +2280,10 @@ const chooseMedia = function (options) {
 };
 
 const READ_IMAGEVIDEO_PERMISSIONS = 'ohos.permission.READ_IMAGEVIDEO';
+const READ_MEDIA_PERMISSIONS = 'ohos.permission.READ_MEDIA';
+const WRITE_MEDIA_PERMISSIONS = 'ohos.permission.WRITE_MEDIA';
+const MEDIA_LOCATION_PERMISSIONS = 'ohos.permission.MEDIA_LOCATION';
+const IMAGE_PERMISSION = [READ_IMAGEVIDEO_PERMISSIONS, READ_MEDIA_PERMISSIONS, WRITE_MEDIA_PERMISSIONS, MEDIA_LOCATION_PERMISSIONS];
 
 // HarmonyOS 图片模块首批接口从API version 7开始支持。
 // HarmonyOS 文档链接：https://developer.harmonyos.com/cn/docs/documentation/doc-references/js-apis-image-0000001122977382
@@ -2326,12 +2330,17 @@ class CompressedImageInfo {
 }
 function saveImage(compressedImageData, compressedImageUri) {
     return __awaiter(this, void 0, void 0, function* () {
-        // 定义要保存的压缩图片uri。afterCompressiona.jpeg表示压缩后的图片。
+        const tempArr = compressedImageUri.split('/');
+        const name = tempArr[tempArr.length - 1];
+        const context = getContext(Current === null || Current === void 0 ? void 0 : 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) {
@@ -2339,19 +2348,19 @@ 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;
     });
 }
 const compressImage = function (options) {
     return new Promise((resolve, reject) => {
-        requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
+        requestPermissions(IMAGE_PERMISSION).then(() => {
             try {
                 validateParams('compressImage', options, compressImageSchema);
             }
@@ -2359,8 +2368,8 @@ const compressImage = function (options) {
                 const res = { errMsg: error.message };
                 return callAsyncFail(reject, res, options);
             }
-            const { src, quality = 80 } = options;
-            const srcAfterCompress = src.split('.').join('_after_compress.');
+            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 stat = fs.statSync(file.fd)
             // console.log('[Taro] 压缩前图片的大小为：', stat.size)
@@ -2370,24 +2379,52 @@ const compressImage = function (options) {
                 callAsyncFail(reject, createImageSourceError, options);
                 return;
             }
-            const packer = image.createImagePacker(file.fd);
-            if (isNull(packer)) {
-                const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' };
-                callAsyncFail(reject, createImagePackerError, 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 packingOptionsOHOS = {
-                // TODO：需要获取文件名后缀
-                format: 'image/jpeg',
-                quality: quality
+            const decodingOptions = {
+                editable: true,
+                desiredPixelFormat: image.PixelMapFormat.RGBA_8888,
+                desiredSize: { width: wantWidth, height: wantHeight }
             };
-            packer.packing(source, packingOptionsOHOS).then((value) => {
-                saveImage(value, srcAfterCompress).then(result => {
-                    callAsyncSuccess(resolve, { tempFilePath: result.imageUri }, options);
-                });
-            }).catch((error) => {
-                callAsyncFail(reject, error, options);
+            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 = {
+                        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);
+                    });
+                }
             });
-            fs.closeSync(file);
         }, (error) => {
             const res = { errMsg: error };
             return callAsyncFail(reject, res, options);
@@ -2396,7 +2433,7 @@ const compressImage = function (options) {
 };
 const chooseImage = function (options) {
     return new Promise((resolve, reject) => {
-        requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
+        requestPermissions(IMAGE_PERMISSION).then(() => {
             try {
                 validateParams('chooseImage', options, chooseImageSchema);
             }
@@ -2414,23 +2451,31 @@ const chooseImage = function (options) {
             photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型为IMAGE
             photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
                 const result = {};
-                if (sizeType.includes('original')) {
+                const isOrigin = photoSelectResult.isOriginalPhoto;
+                if (isOrigin) {
+                    const tempFilePaths = [];
                     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;
+                        fs.closeSync(file);
+                        tempFilePaths.push(uri);
                         return {
                             size,
                             path: uri,
                         };
                     });
                     result.tempFiles = tempFiles;
+                    result.tempFilePaths = tempFilePaths;
+                    callAsyncSuccess(resolve, result, options);
                 }
-                if (sizeType.includes('compressed')) {
+                else {
                     const actions = photoSelectResult.photoUris.map(uri => {
                         return new Promise(resolve => {
                             compressImage({
                                 src: uri,
+                                compressedWidth: getSystemInfoSync().screenWidth / 2,
+                                compressedHeight: getSystemInfoSync().screenHeight / 2,
                                 success: (compressResult) => {
                                     resolve(compressResult.tempFilePath);
                                 }
@@ -2438,16 +2483,24 @@ const chooseImage = function (options) {
                         });
                     });
                     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;
+                            fs.closeSync(file);
+                            return {
+                                size,
+                                path: uri,
+                            };
+                        });
                         result.tempFilePaths = tempFilePaths;
+                        result.tempFiles = tempFiles;
                         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);
             });