@tarojs/plugin-platform-harmony-ets 4.0.0-beta.13 → 4.0.0-beta.131

package/dist/apis/base/system.ts

@@ -5,39 +5,74 @@ import deviceInfo from '@ohos.deviceInfo'
 import _display from '@ohos.display'
 // 从 API Version 7 开始支持
 import i18n from '@ohos.i18n'
+import { Current, window } from '@tarojs/runtime'
 
 import { callAsyncFail, callAsyncSuccess } from '../utils'
 
 import type Taro from '@tarojs/taro/types'
 
 let display
+let navigationIndicatorRect
 let safeArea: TaroGeneral.SafeAreaResult | null = null
-try {
-  display = _display.getDefaultDisplaySync()
-  // @ts-ignore
-  display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} }: _display.CutoutInfo = {}) => {
-    if (err?.code) {
-      console.error('Failed to get cutout info', JSON.stringify(err))
-      return
-    }
+let statusBarHeight
+let windowRect
+
+(Current as any).contextPromise.then((context) => {
+  const win = window.__ohos.getLastWindow(context)
+  win.then(mainWindow => {
+    const topRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_SYSTEM).topRect
+    navigationIndicatorRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_NAVIGATION_INDICATOR).bottomRect
+    statusBarHeight = topRect.top + topRect.height
+    windowRect = mainWindow.getWindowProperties().windowRect
+
+    try {
+      display = _display.getDefaultDisplaySync()
+
+      setSafeArea({
+        top: statusBarHeight,
+        left: 0,
+        right: display.width,
+        bottom: navigationIndicatorRect?.top
+      })
 
-    const top = Math.max(...boundingRects.map(rect => rect.top * 2 + rect.height), waterfallDisplayAreaRects.top?.top + waterfallDisplayAreaRects.top?.height)
-    const bottom = (waterfallDisplayAreaRects.bottom?.top + waterfallDisplayAreaRects.bottom?.height) || display.height
-    const left = waterfallDisplayAreaRects.left?.left + waterfallDisplayAreaRects.left?.width
-    const right = (waterfallDisplayAreaRects.right?.left + waterfallDisplayAreaRects.right?.width) || display.width
-    safeArea = {
-      top,
-      bottom,
-      left,
-      right,
-      height: bottom - top,
-      width: right - left,
+      // @ts-ignore
+      display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} }: _display.CutoutInfo = {}) => {
+        if (err?.code) {
+          console.error('Failed to get cutout info', JSON.stringify(err))
+          return
+        }
+
+        const top = Math.max(...boundingRects.map(rect => rect.top + rect.height), waterfallDisplayAreaRects.top?.top + waterfallDisplayAreaRects.top?.height, statusBarHeight)
+        const bottom = Math.min(display.height - waterfallDisplayAreaRects.bottom?.top, navigationIndicatorRect?.top)
+        const left = waterfallDisplayAreaRects.left?.left + waterfallDisplayAreaRects.left?.width
+        const right = display.width - waterfallDisplayAreaRects.right?.left
+
+        setSafeArea({
+          top,
+          left,
+          right,
+          bottom
+        })
+      })
+    } catch (e) {
+      console.error('Failed to get display', e)
     }
   })
-} catch (e) {
-  console.error('Failed to get display', e)
+})
+
+
+function setSafeArea({ top, left, right, bottom }) {
+  safeArea = {
+    top,
+    bottom,
+    left,
+    right,
+    height: bottom - top,
+    width: right - left,
+  }
 }
 
+
 /* 同步版本 */
 export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
   const res: any = {}
@@ -60,17 +95,17 @@ export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
   res.notificationSoundAuthorized = false // 通知带有声音的开关（仅 iOS 有效）boolean
   res.phoneCalendarAuthorized = null // 使用日历的开关 boolean
   res.wifiEnabled = false // Wi-Fi 的系统开关 boolean
-  res.pixelRatio = display && (Math.round(display.xDPI / display.width * 100) / 100) // 设备像素比,number
+  res.pixelRatio = display && display.densityPixels // 设备像素比,number
   res.platform = 'harmony' // 客户端平台 string
   res.safeArea = safeArea // 在竖屏正方向下的安全区域 General.SafeAreaResult
   res.screenHeight = display?.height // 屏幕高度，单位px number
   res.screenWidth = display?.width // 屏幕宽度，单位px number
-  res.statusBarHeight = safeArea?.top // 状态栏的高度，单位px number
+  res.statusBarHeight = statusBarHeight // 状态栏的高度，单位px number
   res.system = deviceInfo?.osFullName // 操作系统及版本 string
   // Note: 更新配置时才能记录
   res.theme = AppStorage.get('__TARO_APP_CONFIG')?.colorMode === ConfigurationConstant.ColorMode.COLOR_MODE_DARK ? 'dark' : 'light' // 系统当前主题，取值为light或dark 'light' | 'dark'
-  res.windowHeight = display?.height // 可使用窗口高度，单位px number
-  res.windowWidth = display?.width // 可使用窗口宽度，单位px number
+  res.windowHeight = windowRect?.height // 可使用窗口高度，单位px number
+  res.windowWidth = windowRect?.width // 可使用窗口宽度，单位px number
   res.version = deviceInfo?.displayVersion // 版本号 string
 
   return res

package/dist/apis/base/weapp/life-cycle.ts

@@ -1,4 +1,4 @@
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { eventCenter } from '@tarojs/runtime'
 
 import type Taro from '@tarojs/taro/types'
 

package/dist/apis/canvas/index.ts

@@ -1,12 +1,21 @@
+import { eventSource } from '@tarojs/runtime'
+
 import { temporarilyNotSupport } from '../utils'
 
+// @ts-ignore
+import type { TaroCanvasElement } from '@tarojs/runtime'
 // 画布
 
 /** 创建离屏 canvas 实例 */
 export const createOffscreenCanvas = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas')
 
 /** 创建 canvas 的绘图上下文 CanvasContext 对象 */
-export const createCanvasContext = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas')
+// export const createCanvasContext = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas')
+export const createCanvasContext = (canvasId: string) => {
+  const dom = eventSource.get(`canvasId-${canvasId}`)
+  // return dom as TaroCanvasElement
+  if (dom) return (dom as unknown as TaroCanvasElement).context
+}
 
 /** 把当前画布指定区域的内容导出生成指定大小的图片 */
 export const canvasToTempFilePath = /* @__PURE__ */ temporarilyNotSupport('createOffscreenCanvas')

package/dist/apis/device/clipboard.ts

@@ -1,7 +1,10 @@
 // 从 API Version 6 开始支持
 import pasteboard from '@ohos.pasteboard'
+// @ts-ignore
+import { Current } from '@tarojs/runtime'
 import { isString } from '@tarojs/shared'
 
+import {} from '../'
 import { callAsyncFail, getParameterError, object2String } from '../utils'
 import { MethodHandler } from '../utils/handler'
 
@@ -27,9 +30,25 @@ export const setClipboardData: typeof Taro.setClipboardData = function (options)
 
   return new Promise((resolve, reject) => {
     const systemPasteboard = pasteboard.getSystemPasteboard()
-    const pasteData = pasteboard.createPlainTextData(data)
+    const pasteData = pasteboard.createData(pasteboard.MIMETYPE_TEXT_PLAIN, data)
 
-    systemPasteboard.setPasteData(pasteData, (error, data) => { // callback形式调用异步接口
+    try {
+      systemPasteboard.setDataSync(pasteData)
+      // @ts-ignore
+      const uiContext = Current?.page?.getUIContext?.()
+
+      if (!uiContext) return
+
+      uiContext.getPromptAction().showToast({
+        message: '内容已复制',
+        duration: 1500,
+        bottom: '50%',
+        showMode: 1 // 设置弹窗显示模式，显示在应用之上。
+      })
+      return handle.success({
+        data,
+      }, { resolve, reject })
+    } catch (error) {
       if (error) {
         console.error('Failed to set PasteData. Cause: ' + JSON.stringify(error))
         res = {
@@ -37,12 +56,8 @@ export const setClipboardData: typeof Taro.setClipboardData = function (options)
           error: error
         }
         callAsyncFail(reject, res, options)
-      } else {
-        return handle.success({
-          data,
-        }, { resolve, reject })
       }
-    })
+    }
   })
 }
 
@@ -54,7 +69,7 @@ export const getClipboardData: typeof Taro.getClipboardData = function (options)
   const handle = new MethodHandler({ name: 'getClipboardData', success, fail, complete })
   return new Promise((resolve, reject) => {
     const systemPasteboard = pasteboard.getSystemPasteboard()
-    systemPasteboard.getPasteData((error, pasteData) => { // callback 形式调用异步接口
+    systemPasteboard.getData((error, pasteData) => { // callback 形式调用异步接口
       if (error) {
         console.error('Failed to obtain PasteData. Cause: ' + JSON.stringify(error))
         return handle.fail({

package/dist/apis/framework/index.ts

@@ -24,4 +24,4 @@ export { Current, getCurrentInstance } from '@tarojs/runtime'
 
 export const requirePlugin = temporarilyNotSupport('requirePlugin')
 
-export { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm'
+export { eventCenter, Events, History } from '@tarojs/runtime'

package/dist/apis/index.ts

@@ -58,20 +58,25 @@ export function initPxTransform ({
 
 const display = _display.getDefaultDisplaySync()
 
+let displayWidth = display.width
+let ratioCache: number | false = false
 let designWidthFunc: (input: number) => number
+let designWidth = defaultDesignWidth
 function getRatio (value: number) {
-  const config = (Current as any).taro?.config || {}
-  if (!isFunction(designWidthFunc)) {
-    designWidthFunc = isFunction(config.designWidth)
-      ? config.designWidth
-      : () => config.designWidth
-  }
-  const designWidth = designWidthFunc(value) || defaultDesignWidth
-  const deviceRatio = config.deviceRatio || defaultDesignRatio
-  if (!(designWidth in deviceRatio)) {
-    throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`)
+  // Note: 提前调用 display 可能无法获取正确值
+  if (ratioCache === false || displayWidth !== display.width) {
+    const config = (Current as any).taro?.config || {}
+    if (!isFunction(designWidthFunc)) {
+      designWidthFunc = isFunction(config.designWidth)
+        ? config.designWidth
+        : () => config.designWidth
+      designWidth = designWidthFunc(value) || defaultDesignWidth
+    }
+    displayWidth = display.width
+    ratioCache = Math.min(display.width, display.height) / designWidth
   }
-  return Math.min(display.width, display.height) / designWidth / deviceRatio[designWidth]
+
+  return ratioCache
 }
 
 // Note: 设置为 style 单位时会自动完成设计稿转换，设计开发者调用 API 时也许抹平差异，例如 pageScrollTo[option.offsetTop]
@@ -79,6 +84,9 @@ export function pxTransformHelper (size: number, unit?: string, isNumber = false
   const config = (Current as any).taro?.config || {}
   const targetUnit = unit || config.targetUnit || defaultTargetUnit
 
+  if (targetUnit === 'PX') {
+    return px2vp(size * display.scaledDensity) + 'vp'
+  }
   const ratio = getRatio(size)
   let val = size * ratio
 
@@ -92,19 +100,19 @@ export function pxTransformHelper (size: number, unit?: string, isNumber = false
   return isNumber ? val : val + targetUnit
 }
 
-export function pxTransform (size: number): number {
+export function pxTransform (size: number): number | string {
   const config = (Current as any).taro?.config || {}
   const targetUnit = config.targetUnit || defaultTargetUnit
 
-  let val = size
+  const val = size
   switch (targetUnit) {
     case 'vp':
-      val = px2vp(size)
-      break
+      return pxTransformHelper(size, 'px')
+      // return `${size}lpx`
     default:
       // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
   }
-  return val + config.targetUnit
+  return val + targetUnit
 }
 
 export function canIUseWebp () {

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

@@ -9,10 +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 { Current } from '@tarojs/runtime'
 import { isNull } from '@tarojs/shared'
 
+import { getSystemInfoSync } from '../../base'
 import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
 
 import type Taro from '@tarojs/taro/types'
@@ -22,12 +25,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,6 +72,44 @@ export const getImageInfo: typeof Taro.getImageInfo = function (options) {
   })
 }
 
+
+class CompressedImageInfo {
+  imageUri = '' // 压缩后图片保存位置的uri
+  imageByteLength = 0 // 压缩后图片字节长度
+}
+
+async function saveImage(compressedImageData, compressedImageUri) {
+  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(filePath)
+    if (res) {
+      // 如果图片afterCompressiona.jpeg已存在，则删除
+      fs.unlinkSync(filePath)
+    }
+  } catch (err) {
+    console.error(`[Taro] saveImage Error: AccessSync failed with error message: ${err.message}, error code: ${err.code}`)
+  }
+
+  // 知识点：保存图片。获取最终图片压缩数据compressedImageData，保存图片。
+  // 压缩图片数据写入文件
+  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 = filePath
+  compressedImageInfo.imageByteLength = compressedImageData.byteLength
+
+  return compressedImageInfo
+}
+
 export const compressImage: typeof Taro.compressImage = function (options) {
   return new Promise((resolve, reject) => {
     try {
@@ -68,30 +118,68 @@ export const compressImage: typeof Taro.compressImage = function (options) {
       const res = { errMsg: error.message }
       return callAsyncFail(reject, res, options)
     }
-    const { src, quality = 80 } = 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 source = image.createImageSource(src)
+    // 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(src)
-    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) => {
-      callAsyncSuccess(resolve, value, 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)
+        })
+      }
     })
   })
 }
@@ -107,12 +195,76 @@ export const chooseImage: typeof Taro.chooseImage = function (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) => {
-      callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris })
+      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
+
+          fs.closeSync(file)
+          tempFilePaths.push(uri)
+
+          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)
+              }
+            })
+          })
+        })
+
+        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)
+        })
+      }
     }).catch((error) => {
       callAsyncFail(reject, error, options)
     })

package/dist/apis/network/downloadFile.ts

@@ -8,10 +8,12 @@
 // ❌ DownloadTask.offHeadersReceived 此接口 ohos 不支持
 
 import request from '@ohos.request'
-import Taro, { DownloadTask } from '@tarojs/taro'
 
 import { callAsyncFail, callAsyncSuccess, validateParams } from '../utils'
 
+import type Taro from '@tarojs/taro/types'
+import type { DownloadTask } from '@tarojs/taro/types'
+
 interface IDownloadConfigOHOS {
   url: string
   header?: any

package/dist/apis/network/uploadFile.ts

@@ -9,10 +9,12 @@
 
 import request from '@ohos.request'
 import { isUndefined } from '@tarojs/shared'
-import Taro, { UploadTask } from '@tarojs/taro'
 
 import { callAsyncFail, callAsyncSuccess, validateParams } from '../utils'
 
+import type Taro from '@tarojs/taro/types'
+import type { UploadTask } from '@tarojs/taro/types'
+
 interface IOHOSFileType {
   filename?: string
   name?: string

package/dist/apis/route/index.ts

@@ -1,6 +1,5 @@
 import router from '@ohos.router'
-import { window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { eventCenter, window } from '@tarojs/runtime'
 import { queryToJson } from '@tarojs/shared'
 
 import { callAsyncFail, callAsyncSuccess } from '../utils'