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

package/dist/runtime.js

@@ -1,7 +1,7 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents, mergeReconciler, mergeInternalComponents } 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 '@ohos.abilityAccessCtrl';
 import { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
 import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant';
 import deviceInfo from '@ohos.deviceInfo';
@@ -176,21 +176,6 @@ 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) {
@@ -2279,8 +2264,6 @@ 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
@@ -2326,12 +2309,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,121 +2327,155 @@ 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(() => {
-            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);
+        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 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 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);
             }
-            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);
+            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);
                 });
-            }).catch((error) => {
-                callAsyncFail(reject, error, options);
-            });
-            fs.closeSync(file);
-        }, (error) => {
-            const res = { errMsg: error };
-            return callAsyncFail(reject, res, options);
+            }
         });
     });
 };
 const 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);
-            }
-            const { count = 9 } = options;
-            const photoViewPicker = new picker.PhotoViewPicker();
-            let sizeType = options.sizeType;
-            if (!sizeType || !sizeType.length) {
-                sizeType = ['compressed', 'original'];
+        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 = {};
+            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);
             }
-            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 => {
+            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);
+                            }
+                        });
+                    });
+                });
+                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;
-                }
-                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);
+                }).catch(error => {
+                    const res = { errMsg: error };
+                    return callAsyncFail(reject, res, options);
+                });
+            }
+        }).catch((error) => {
+            callAsyncFail(reject, error, options);
         });
     });
 };