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

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

@@ -9,11 +9,13 @@
 // ❌ wx.saveImageToPhotosAlbum(Object object) api 9+ HarmonyOS不支持
 // ❌ wx.previewImage(Object object) api 9+ HarmonyOS不支持
 
+import fs from '@ohos.file.fs'
 import picker from '@ohos.file.picker'
 import image from '@ohos.multimedia.image'
 import { isNull } from '@tarojs/shared'
 
-import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
+import { callAsyncFail, callAsyncSuccess, requestPermissions, temporarilyNotSupport, validateParams } from '../../utils'
+import { READ_IMAGEVIDEO_PERMISSIONS } from '../../utils/permissions'
 
 import type Taro from '@tarojs/taro/types'
 
@@ -22,12 +24,21 @@ interface IPackingOptionOHOS {
   quality: number
 }
 
+interface IChooseImageData {
+  tempFilePaths?: string[]
+
+  tempFiles?: {
+    path: string
+    size: number
+  }
+}
+
 const getImageInfoSchema = {
-  url: 'String'
+  src: 'String'
 }
 
 const compressImageSchema = {
-  url: 'String'
+  src: 'String'
 }
 
 const chooseImageSchema = {
@@ -60,61 +71,155 @@ export const getImageInfo: typeof Taro.getImageInfo = function (options) {
   })
 }
 
-export const compressImage: typeof Taro.compressImage = function (options) {
-  return new Promise((resolve, reject) => {
-    try {
-      validateParams('compressImage', options, compressImageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
-      return callAsyncFail(reject, res, options)
-    }
-    const { src, quality = 80 } = options
 
-    const source = image.createImageSource(src)
-    if (isNull(source)) {
-      const createImageSourceError = { errMsg: 'compressImage fail: createImageSource has failed.' }
-      callAsyncFail(reject, createImageSourceError, options)
-      return
-    }
+class CompressedImageInfo {
+  imageUri = '' // 压缩后图片保存位置的uri
+  imageByteLength = 0 // 压缩后图片字节长度
+}
 
-    const packer = image.createImagePacker(src)
-    if (isNull(packer)) {
-      const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' }
-      callAsyncFail(reject, createImagePackerError, options)
+async function saveImage(compressedImageData, compressedImageUri) {
+  // 定义要保存的压缩图片uri。afterCompressiona.jpeg表示压缩后的图片。
+  try {
+    const res = fs.accessSync(compressedImageUri)
+    if (res) {
+      // 如果图片afterCompressiona.jpeg已存在，则删除
+      fs.unlinkSync(compressedImageUri)
     }
+  } catch (err) {
+    console.error(`[Taro] saveImage Error: AccessSync failed with error message: ${err.message}, error code: ${err.code}`)
+  }
+
+  // 知识点：保存图片。获取最终图片压缩数据compressedImageData，保存图片。
+  // 压缩图片数据写入文件
+  const file = fs.openSync(compressedImageUri, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE)
+  fs.writeSync(file.fd, compressedImageData)
+  fs.closeSync(file)
+
+  // 获取压缩图片信息
+  const compressedImageInfo = new CompressedImageInfo()
+  compressedImageInfo.imageUri = compressedImageUri
+  compressedImageInfo.imageByteLength = compressedImageData.byteLength
+
+  return compressedImageInfo
+}
 
-    const packingOptionsOHOS: IPackingOptionOHOS = {
-      // TODO：需要获取文件名后缀
-      format: 'image/jpeg',
-      quality: quality
-    }
-    packer.packing(source, packingOptionsOHOS).then((value) => {
-      callAsyncSuccess(resolve, value, options)
-    }).catch((error) => {
-      callAsyncFail(reject, error, options)
+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
+      }
+
+      const packer = image.createImagePacker(file.fd)
+      if (isNull(packer)) {
+        const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' }
+        callAsyncFail(reject, createImagePackerError, options)
+      }
+
+      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)
+      })
+
+      fs.closeSync(file)
+    }, (error: string) => {
+      const res = { errMsg: error }
+      return callAsyncFail(reject, res, options)
     })
   })
 }
 
 export const chooseImage: typeof Taro.chooseImage = function (options) {
   return new Promise((resolve, reject) => {
-    try {
-      validateParams('chooseImage', options, chooseImageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
+    requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
+      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
+
+      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 = {}
+
+        if (sizeType.includes('original')) {
+          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
+
+            return {
+              size,
+              path: uri,
+            }
+          })
+
+          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)
-    }
-
-    const { count = 9 } = options
-    const photoViewPicker = new picker.PhotoViewPicker()
-
-    photoSelectOptions.maxSelectNumber = count // 选择媒体文件的最大数目
-    photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE // 过滤选择媒体文件类型为IMAGE
-
-    photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
-      callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris }, options)
-    }).catch((error) => {
-      callAsyncFail(reject, error, options)
     })
   })
 }

package/dist/apis/utils/index.ts

@@ -1,3 +1,5 @@
+import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
+import { Current } from '@tarojs/runtime'
 import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
 
 import { ICallbackResult, MethodHandler } from './handler'
@@ -8,6 +10,22 @@ export * from './validate'
 export { MethodHandler }
 export { noop } from '@tarojs/shared'
 
+export function requestPermissions (permissions: string[]) {
+  return new Promise<void>((resolve, reject) => {
+    const context = getContext(Current?.page)
+    const atManager = abilityAccessCtrl.createAtManager()
+
+    atManager.requestPermissionsFromUser(context, permissions, (err, _) => {
+      if (err) {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject(`[Taro] 请求用户授权 ${permissions.join('、')} 失败：${JSON.stringify(err)}`)
+      } else {
+        resolve()
+      }
+    })
+  })
+}
+
 export function object2String (obj) {
   let str = ''
   for (const item in obj) {

package/dist/apis/utils/permissions.ts

@@ -0,0 +1 @@
+export const READ_IMAGEVIDEO_PERMISSIONS = 'ohos.permission.READ_IMAGEVIDEO'

package/dist/components-harmony-ets/utils/styles.ets

@@ -89,6 +89,8 @@ export function isMaxWidthView (node: TaroElement) {
 }
 
 export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle): HarmonyStyle {
+  if (!node) return {}
+   
   const hmStyle = node.hmStyle
   
   if (!hmStyle) return {}

package/dist/runtime-utils.js

@@ -1,6 +1,7 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents } from '@tarojs/shared';
 import _display from '@ohos.display';
 import { Current, window, eventSource, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, getCurrentInstance } from '@tarojs/runtime';
+import abilityAccessCtrl from '@ohos.abilityAccessCtrl';
 import { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
 import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant';
 import deviceInfo from '@ohos.deviceInfo';
@@ -22,6 +23,7 @@ import app from '@system.app';
 import file from '@system.file';
 import geoLocationManager from '@ohos.geoLocationManager';
 import mediaLibrary from '@ohos.multimedia.mediaLibrary';
+import fs from '@ohos.file.fs';
 import picker from '@ohos.file.picker';
 import image from '@ohos.multimedia.image';
 import request$1 from '@ohos.request';
@@ -174,6 +176,21 @@ const validateParams = function (name, params, schema) {
     }
 };
 
+function requestPermissions(permissions) {
+    return new Promise((resolve, reject) => {
+        const context = getContext(Current === null || Current === void 0 ? void 0 : Current.page);
+        const atManager = abilityAccessCtrl.createAtManager();
+        atManager.requestPermissionsFromUser(context, permissions, (err, _) => {
+            if (err) {
+                // eslint-disable-next-line prefer-promise-reject-errors
+                reject(`[Taro] 请求用户授权 ${permissions.join('、')} 失败：${JSON.stringify(err)}`);
+            }
+            else {
+                resolve();
+            }
+        });
+    });
+}
 function object2String(obj) {
     let str = '';
     for (const item in obj) {
@@ -2262,20 +2279,16 @@ const chooseMedia = function (options) {
     });
 };
 
+const READ_IMAGEVIDEO_PERMISSIONS = 'ohos.permission.READ_IMAGEVIDEO';
+
 // HarmonyOS 图片模块首批接口从API version 7开始支持。
 // HarmonyOS 文档链接：https://developer.harmonyos.com/cn/docs/documentation/doc-references/js-apis-image-0000001122977382
 // WX 文档链接：https://developers.weixin.qq.com/miniprogram/dev/api/media/image/wx.saveImageToPhotosAlbum.html
-// ✅ wx.getImageInfo(Object object) API7以上支持
-// ✅ wx.compressImage(Object object) API7以上支持
-// ✅ wx.chooseImage(Object object)
-// ❌ wx.chooseMessageFile(Object object) HarmonyOS不支持
-// ❌ wx.saveImageToPhotosAlbum(Object object) api 9+ HarmonyOS不支持
-// ❌ wx.previewImage(Object object) api 9+ HarmonyOS不支持
 const getImageInfoSchema = {
-    url: 'String'
+    src: 'String'
 };
 const compressImageSchema = {
-    url: 'String'
+    src: 'String'
 };
 const chooseImageSchema = {
     count: 'Number'
@@ -2305,56 +2318,142 @@ const getImageInfo = function (options) {
         });
     });
 };
-const compressImage = function (options) {
-    return new Promise((resolve, reject) => {
+class CompressedImageInfo {
+    constructor() {
+        this.imageUri = ''; // 压缩后图片保存位置的uri
+        this.imageByteLength = 0; // 压缩后图片字节长度
+    }
+}
+function saveImage(compressedImageData, compressedImageUri) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // 定义要保存的压缩图片uri。afterCompressiona.jpeg表示压缩后的图片。
         try {
-            validateParams('compressImage', options, compressImageSchema);
+            const res = fs.accessSync(compressedImageUri);
+            if (res) {
+                // 如果图片afterCompressiona.jpeg已存在，则删除
+                fs.unlinkSync(compressedImageUri);
+            }
         }
-        catch (error) {
-            const res = { errMsg: error.message };
+        catch (err) {
+            console.error(`[Taro] saveImage Error: AccessSync failed with error message: ${err.message}, error code: ${err.code}`);
+        }
+        // 知识点：保存图片。获取最终图片压缩数据compressedImageData，保存图片。
+        // 压缩图片数据写入文件
+        const file = fs.openSync(compressedImageUri, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE);
+        fs.writeSync(file.fd, compressedImageData);
+        fs.closeSync(file);
+        // 获取压缩图片信息
+        const compressedImageInfo = new CompressedImageInfo();
+        compressedImageInfo.imageUri = compressedImageUri;
+        compressedImageInfo.imageByteLength = compressedImageData.byteLength;
+        return compressedImageInfo;
+    });
+}
+const 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;
+            }
+            const packer = image.createImagePacker(file.fd);
+            if (isNull(packer)) {
+                const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' };
+                callAsyncFail(reject, createImagePackerError, options);
+            }
+            const packingOptionsOHOS = {
+                // 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);
+            });
+            fs.closeSync(file);
+        }, (error) => {
+            const res = { errMsg: error };
             return callAsyncFail(reject, res, options);
-        }
-        const { src, quality = 80 } = options;
-        const source = image.createImageSource(src);
-        if (isNull(source)) {
-            const createImageSourceError = { errMsg: 'compressImage fail: createImageSource has failed.' };
-            callAsyncFail(reject, createImageSourceError, options);
-            return;
-        }
-        const packer = image.createImagePacker(src);
-        if (isNull(packer)) {
-            const createImagePackerError = { errMsg: 'compressImage fail: createImagePacker has failed.' };
-            callAsyncFail(reject, createImagePackerError, options);
-        }
-        const packingOptionsOHOS = {
-            // TODO：需要获取文件名后缀
-            format: 'image/jpeg',
-            quality: quality
-        };
-        packer.packing(source, packingOptionsOHOS).then((value) => {
-            callAsyncSuccess(resolve, value, options);
-        }).catch((error) => {
-            callAsyncFail(reject, error, options);
         });
     });
 };
 const chooseImage = function (options) {
     return new Promise((resolve, reject) => {
-        try {
-            validateParams('chooseImage', options, chooseImageSchema);
-        }
-        catch (error) {
-            const res = { errMsg: error.message };
+        requestPermissions([READ_IMAGEVIDEO_PERMISSIONS]).then(() => {
+            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;
+            if (!sizeType || !sizeType.length) {
+                sizeType = ['compressed', 'original'];
+            }
+            photoSelectOptions.maxSelectNumber = count; // 选择媒体文件的最大数目
+            photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型为IMAGE
+            photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
+                const result = {};
+                if (sizeType.includes('original')) {
+                    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;
+                        return {
+                            size,
+                            path: uri,
+                        };
+                    });
+                    result.tempFiles = tempFiles;
+                }
+                if (sizeType.includes('compressed')) {
+                    const actions = photoSelectResult.photoUris.map(uri => {
+                        return new Promise(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) => {
+            const res = { errMsg: error };
             return callAsyncFail(reject, res, options);
-        }
-        const { count = 9 } = options;
-        const photoViewPicker = new picker.PhotoViewPicker();
-        photoSelectOptions.maxSelectNumber = count; // 选择媒体文件的最大数目
-        photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE; // 过滤选择媒体文件类型为IMAGE
-        photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
-            callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris }, options);
-        }).catch((error) => {
-            callAsyncFail(reject, error, options);
         });
     });
 };