@dcloudio/uni-h5 2.0.0 → 2.0.1-32920211122002

package/src/platforms/app-plus/service/api/ad/interactive-ad.js

@@ -0,0 +1,257 @@
+import {
+  requireNativePlugin
+} from '../../bridge'
+
+import {
+  eventTypes,
+  eventNames
+} from './ad-base.js'
+
+const sdkCache = {}
+const sdkQueue = {}
+
+function initSDK (options) {
+  const provider = options.provider
+  if (!sdkCache[provider]) {
+    sdkCache[provider] = {}
+  }
+  if (typeof sdkCache[provider].instance === 'object') {
+    options.success(sdkCache[provider].instance)
+    return
+  }
+
+  if (!sdkQueue[provider]) {
+    sdkQueue[provider] = []
+  }
+  sdkQueue[provider].push(options)
+
+  if (sdkCache[provider].loading === true) {
+    options.__plugin = sdkCache[provider].plugin
+    return
+  }
+  sdkCache[provider].loading = true
+  const plugin = requireNativePlugin(provider) || {}
+  const initFunction = plugin.init || plugin.initSDK
+  if (!initFunction) {
+    sdkQueue[provider].forEach((item) => {
+      item.fail({
+        code: -1,
+        message: 'provider [' + provider + '] invalid'
+      })
+    })
+    sdkQueue[provider].length = 0
+    sdkCache[provider].loading = false
+    return
+  }
+  sdkCache[provider].plugin = plugin
+  options.__plugin = plugin
+  initFunction((res) => {
+    const code = res.code
+    const isSuccess = (provider === 'BXM-AD') ? (code === 0 || code === 1) : (code === 0)
+    if (isSuccess) {
+      sdkCache[provider].instance = plugin
+    } else {
+      sdkCache[provider].loading = false
+    }
+
+    sdkQueue[provider].forEach((item) => {
+      if (isSuccess) {
+        item.success(item.__plugin)
+      } else {
+        item.fail(res)
+      }
+    })
+    sdkQueue[provider].length = 0
+  })
+}
+
+class InteractiveAd {
+  constructor (options) {
+    const _callbacks = this._callbacks = {}
+    eventNames.forEach(item => {
+      _callbacks[item] = []
+      const name = item[0].toUpperCase() + item.substr(1)
+      this[`on${name}`] = function (callback) {
+        _callbacks[item].push(callback)
+      }
+    })
+
+    this._ad = null
+    this._adError = ''
+    this._adpid = options.adpid
+    this._provider = options.provider
+    this._userData = options.userData || {}
+    this._isLoaded = false
+    this._isLoading = false
+    this._loadPromiseResolve = null
+    this._loadPromiseReject = null
+    this._showPromiseResolve = null
+    this._showPromiseReject = null
+
+    setTimeout(() => {
+      this._init()
+    })
+  }
+
+  _init () {
+    this._adError = ''
+    initSDK({
+      provider: this._provider,
+      success: (res) => {
+        this._ad = res
+        if (this._userData) {
+          this.bindUserData(this._userData)
+        }
+        this._loadAd()
+      },
+      fail: (err) => {
+        this._adError = err
+        this._dispatchEvent(eventTypes.error, err)
+      }
+    })
+  }
+
+  getProvider () {
+    return this._provider
+  }
+
+  load () {
+    return new Promise((resolve, reject) => {
+      this._loadPromiseResolve = resolve
+      this._loadPromiseReject = reject
+      if (this._isLoading) {
+        return
+      }
+
+      if (this._adError) {
+        this._init()
+        return
+      }
+
+      if (this._isLoaded) {
+        resolve()
+      } else {
+        this._loadAd()
+      }
+    })
+  }
+
+  show () {
+    return new Promise((resolve, reject) => {
+      this._showPromiseResolve = resolve
+      this._showPromiseReject = reject
+
+      if (this._isLoading) {
+        return
+      }
+
+      if (this._adError) {
+        this._init()
+        return
+      }
+
+      if (this._isLoaded) {
+        this._showAd()
+        resolve()
+      } else {
+        this._loadAd()
+      }
+    })
+  }
+
+  destroy () {
+    if (this._ad !== null && this._ad.destroy) {
+      this._ad.destroy({
+        adpid: this._adpid
+      })
+    }
+  }
+
+  bindUserData (data) {
+    if (this._ad !== null && this._ad.bindUserData) {
+      this._ad.bindUserData(data)
+    }
+  }
+
+  _loadAd () {
+    if (this._ad !== null) {
+      if (this._isLoading === true) {
+        return
+      }
+      this._isLoading = true
+
+      this._ad.loadData({
+        adpid: this._adpid,
+        ...this._userData
+      }, (res) => {
+        this._isLoaded = true
+        this._isLoading = false
+
+        if (this._loadPromiseResolve != null) {
+          this._loadPromiseResolve()
+          this._loadPromiseResolve = null
+        }
+        if (this._showPromiseResolve != null) {
+          this._showPromiseResolve()
+          this._showPromiseResolve = null
+          this._showAd()
+        }
+
+        this._dispatchEvent(eventTypes.load, res)
+      }, (err) => {
+        this._isLoading = false
+
+        if (this._showPromiseReject != null) {
+          this._showPromiseReject(this._createError(err))
+          this._showPromiseReject = null
+        }
+
+        this._dispatchEvent(eventTypes.error, err)
+      })
+    }
+  }
+
+  _showAd () {
+    if (this._ad !== null && this._isLoaded === true) {
+      this._ad.show({
+        adpid: this._adpid
+      }, (res) => {
+        this._isLoaded = false
+      }, (err) => {
+        this._isLoaded = false
+
+        if (this._showPromiseReject != null) {
+          this._showPromiseReject(this._createError(err))
+          this._showPromiseReject = null
+        }
+
+        this._dispatchEvent(eventTypes.error, err)
+      })
+    }
+  }
+
+  _createError (err) {
+    const error = new Error(JSON.stringify(err))
+    error.code = err.code
+    error.errMsg = err.message
+    return error
+  }
+
+  _dispatchEvent (name, data) {
+    this._callbacks[name].forEach(callback => {
+      if (typeof callback === 'function') {
+        callback(data || {})
+      }
+    })
+  }
+}
+
+export function createInteractiveAd (options) {
+  if (!options.provider) {
+    return new Error('provider invalid')
+  }
+  if (!options.adpid) {
+    return new Error('adpid invalid')
+  }
+  return new InteractiveAd(options)
+}

package/src/platforms/app-plus/service/api/ad/interstitial-ad.js

@@ -0,0 +1,15 @@
+import {
+  AdBase
+} from './ad-base.js'
+
+class InterstitialAd extends AdBase {
+  constructor (options = {}) {
+    super(plus.ad.createInterstitialAd(options), options)
+
+    this._loadAd()
+  }
+}
+
+export function createInterstitialAd (options) {
+  return new InterstitialAd(options)
+}

package/src/platforms/app-plus/service/api/ad/rewarded-video-ad.js

@@ -24,6 +24,7 @@ class RewardedVideoAd {
 
     this._preload = options.preload !== undefined ? options.preload : true
     this._isLoad = false
+    this._isLoading = false
     this._adError = ''
     this._loadPromiseResolve = null
     this._loadPromiseReject = null
@@ -32,6 +33,7 @@ class RewardedVideoAd {
     const rewardAd = this._rewardAd = plus.ad.createRewardedVideoAd(options)
     rewardAd.onLoad((e) => {
       this._isLoad = true
+      this._isLoading = false
       this._lastLoadTime = Date.now()
       this._dispatchEvent('load', {})
 
@@ -41,6 +43,8 @@ class RewardedVideoAd {
       }
     })
     rewardAd.onClose((e) => {
+      this._isLoad = false
+      this._isLoading = false
       if (this._preload) {
         this._loadAd()
       }
@@ -50,6 +54,7 @@ class RewardedVideoAd {
       this._dispatchEvent('verify', { isValid: e.isValid })
     })
     rewardAd.onError((e) => {
+      this._isLoading = false
       const { code, message } = e
       const data = { code: code, errMsg: message }
       this._adError = message
@@ -78,18 +83,25 @@ class RewardedVideoAd {
 
   load () {
     return new Promise((resolve, reject) => {
+      this._loadPromiseResolve = resolve
+      this._loadPromiseReject = reject
+      if (this._isLoading) {
+        return
+      }
       if (this._isLoad) {
         resolve()
         return
       }
-      this._loadPromiseResolve = resolve
-      this._loadPromiseReject = reject
       this._loadAd()
     })
   }
 
   show () {
     return new Promise((resolve, reject) => {
+      if (this._isLoading) {
+        return
+      }
+
       const provider = this.getProvider()
       if (provider === ProviderType.CSJ && this.isExpired) {
         this._isLoad = false
@@ -118,6 +130,7 @@ class RewardedVideoAd {
 
   _loadAd () {
     this._isLoad = false
+    this._isLoading = true
     this._rewardAd.load()
   }
 

package/src/platforms/app-plus/service/api/device/system.js

@@ -20,6 +20,7 @@ export function getSystemInfoSync () {
 export function getSystemInfo () {
   const platform = plus.os.name.toLowerCase()
   const ios = platform === 'ios'
+  const isAndroid = platform === 'android'
   const {
     screenWidth,
     screenHeight
@@ -86,7 +87,7 @@ export function getSystemInfo () {
     windowHeight,
     statusBarHeight,
     language: plus.os.language,
-    system: plus.os.version,
+    system: `${ios ? 'iOS' : isAndroid ? 'Android' : ''} ${plus.os.version}`,
     version: plus.runtime.innerVersion,
     fontSizeSetting: '',
     platform,
@@ -102,4 +103,4 @@ export function getSystemInfo () {
     },
     deviceId: deviceId()
   }
-}
+}

package/src/platforms/app-plus/service/api/file/open-document.js

@@ -1,23 +1,15 @@
 import {
-  getRealPath
+  getRealPath,
+  warpPlusSuccessCallback,
+  warpPlusErrorCallback
 } from '../util'
 
-import {
-  invoke
-} from '../../bridge'
-
 export function openDocument ({
   filePath,
   fileType
 } = {}, callbackId) {
-  plus.io.resolveLocalFileSystemURL(getRealPath(filePath), entry => {
-    plus.runtime.openFile(getRealPath(filePath))
-    invoke(callbackId, {
-      errMsg: 'openDocument:ok'
-    })
-  }, err => {
-    invoke(callbackId, {
-      errMsg: 'openDocument:fail ' + err.message
-    })
-  })
+  const successCallback = warpPlusSuccessCallback(callbackId, 'saveFile')
+  const errorCallback = warpPlusErrorCallback(callbackId, 'saveFile')
+
+  plus.runtime.openDocument(getRealPath(filePath), undefined, successCallback, errorCallback)
 }

package/src/platforms/app-plus/service/api/index.js

@@ -81,3 +81,5 @@ export * from './ui/request-component-info'
 export * from './ad/ad'
 export * from './ad/rewarded-video-ad'
 export * from './ad/full-screen-video-ad'
+export * from './ad/interstitial-ad'
+export * from './ad/interactive-ad'

package/src/platforms/app-plus/service/api/location/get-location.js

@@ -1,6 +1,7 @@
 import {
   wgs84togcj02,
-  gcj02towgs84
+  gcj02towgs84,
+  warpPlusErrorCallback
 } from '../util'
 
 import {
@@ -51,8 +52,10 @@ function getLocationSuccess (type, position, callbackId) {
 export function getLocation ({
   type = 'wgs84',
   geocode = false,
-  altitude = false
+  altitude = false,
+  highAccuracyExpireTime
 } = {}, callbackId) {
+  const errorCallback = warpPlusErrorCallback(callbackId, 'getLocation')
   plus.geolocation.getCurrentPosition(
     position => {
       getLocationSuccess(type, position, callbackId)
@@ -63,13 +66,11 @@ export function getLocation ({
         getLocationSuccess(type, e, callbackId)
         return
       }
-
-      invoke(callbackId, {
-        errMsg: 'getLocation:fail ' + e.message
-      })
+      errorCallback(e)
     }, {
       geocode: geocode,
-      enableHighAccuracy: altitude
+      enableHighAccuracy: altitude,
+      timeout: highAccuracyExpireTime
     }
   )
 }

package/src/platforms/app-plus/service/api/media/choose-image.js

@@ -7,8 +7,7 @@ import {
 } from '../../bridge'
 
 import {
-  warpPlusErrorCallback,
-  getFileName
+  warpPlusErrorCallback
 } from '../util'
 
 import {
@@ -28,64 +27,32 @@ function getFileInfo (filePath) {
   })
 }
 
-function compressImage (tempFilePath) {
-  const dstPath = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(tempFilePath)}`
-  return new Promise((resolve, reject) => {
-    plus.nativeUI.showWaiting()
-    plus.zip.compressImage({
-      src: tempFilePath,
-      dst: dstPath,
-      overwrite: true
-    }, () => {
-      plus.nativeUI.closeWaiting()
-      resolve(dstPath)
-    }, (error) => {
-      plus.nativeUI.closeWaiting()
-      reject(error)
-    })
-  })
-}
-
 export function chooseImage ({
   count,
   sizeType,
-  sourceType
+  sourceType,
+  crop
 } = {}, callbackId) {
   const errorCallback = warpPlusErrorCallback(callbackId, 'chooseImage', 'cancel')
 
   function successCallback (paths) {
     const tempFiles = []
     const tempFilePaths = []
-    // plus.zip.compressImage 压缩文件并发调用在iOS端容易出现问题（图像错误、闪退），改为队列执行
-    paths.reduce((promise, path) => {
-      return promise.then(() => {
-        return getFileInfo(path)
-      }).then(fileInfo => {
-        const size = fileInfo.size
-        // 压缩阈值 0.5 兆
-        const THRESHOLD = 1024 * 1024 * 0.5
-        // 判断是否需要压缩
-        if (sizeType.includes('compressed') && size > THRESHOLD) {
-          return compressImage(path).then(dstPath => {
-            path = dstPath
-            return getFileInfo(path)
-          })
-        }
-        return fileInfo
-      }).then(({ size }) => {
-        tempFilePaths.push(path)
-        tempFiles.push({
-          path,
-          size
+    Promise.all(paths.map((path) => getFileInfo(path)))
+      .then((filesInfo) => {
+        filesInfo.forEach((file, index) => {
+          const path = paths[index]
+          tempFilePaths.push(path)
+          tempFiles.push({ path, size: file.size })
+        })
+
+        invoke(callbackId, {
+          errMsg: 'chooseImage:ok',
+          tempFilePaths,
+          tempFiles
         })
       })
-    }, Promise.resolve()).then(() => {
-      invoke(callbackId, {
-        errMsg: 'chooseImage:ok',
-        tempFilePaths,
-        tempFiles
-      })
-    }).catch(errorCallback)
+      .catch(errorCallback)
   }
 
   function openCamera () {
@@ -93,7 +60,9 @@ export function chooseImage ({
     camera.captureImage(path => successCallback([path]),
       errorCallback, {
         filename: TEMP_PATH + '/camera/',
-        resolution: 'high'
+        resolution: 'high',
+        crop,
+        sizeType
       })
   }
 
@@ -103,7 +72,9 @@ export function chooseImage ({
       multiple: true,
       system: false,
       filename: TEMP_PATH + '/gallery/',
-      permissionAlert: true
+      permissionAlert: true,
+      crop,
+      sizeType
     })
   }
 

package/src/platforms/app-plus/service/api/media/choose-video.js

@@ -7,8 +7,7 @@ import {
 } from '../../bridge'
 
 import {
-  warpPlusErrorCallback,
-  getFileName
+  warpPlusErrorCallback
 } from '../util'
 
 import {
@@ -24,38 +23,20 @@ export function chooseVideo ({
   const errorCallback = warpPlusErrorCallback(callbackId, 'chooseVideo', 'cancel')
 
   function successCallback (tempFilePath = '') {
-    const dst = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(tempFilePath)}`
-    const compressVideo = compressed ? plus.zip.compressVideo : function (_, callback) {
-      callback({ tempFilePath })
-    }
-    if (compressed) {
-      plus.nativeUI.showWaiting()
-    }
-    compressVideo({
-      src: tempFilePath,
-      dst
-    }, ({ tempFilePath }) => {
-      if (compressed) {
-        plus.nativeUI.closeWaiting()
-      }
-      plus.io.getVideoInfo({
-        filePath: tempFilePath,
-        success (videoInfo) {
-          const result = {
-            errMsg: 'chooseVideo:ok',
-            tempFilePath: tempFilePath
-          }
-          result.size = videoInfo.size
-          result.duration = videoInfo.duration
-          result.width = videoInfo.width
-          result.height = videoInfo.height
-          invoke(callbackId, result)
-        },
-        errorCallback
-      })
-    }, error => {
-      plus.nativeUI.closeWaiting()
-      errorCallback(error)
+    plus.io.getVideoInfo({
+      filePath: tempFilePath,
+      success (videoInfo) {
+        const result = {
+          errMsg: 'chooseVideo:ok',
+          tempFilePath: tempFilePath
+        }
+        result.size = videoInfo.size
+        result.duration = videoInfo.duration
+        result.width = videoInfo.width
+        result.height = videoInfo.height
+        invoke(callbackId, result)
+      },
+      fail: errorCallback
     })
   }
 
@@ -67,7 +48,8 @@ export function chooseVideo ({
       multiple: true,
       maximum: 1,
       filename: TEMP_PATH + '/gallery/',
-      permissionAlert: true
+      permissionAlert: true,
+      videoCompress: compressed
     })
   }
 
@@ -76,7 +58,8 @@ export function chooseVideo ({
     plusCamera.startVideoCapture(successCallback, errorCallback, {
       index: camera === 'front' ? 2 : 1,
       videoMaximumDuration: maxDuration,
-      filename: TEMP_PATH + '/camera/'
+      filename: TEMP_PATH + '/camera/',
+      videoCompress: compressed
     })
   }
 

package/src/platforms/app-plus/service/api/media/compress-video.js

@@ -9,10 +9,10 @@ import {
 } from '../util'
 
 export function compressVideo (options, callbackId) {
-  const dst = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(options.src)}`
+  const filename = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(options.src)}`
   const successCallback = warpPlusSuccessCallback(callbackId, 'compressVideo')
   const errorCallback = warpPlusErrorCallback(callbackId, 'compressVideo')
   plus.zip.compressVideo(Object.assign({}, options, {
-    dst
+    filename
   }), successCallback, errorCallback)
 }

package/src/platforms/app-plus/service/api/media/get-video-info.js

@@ -7,10 +7,13 @@ export const getVideoInfo = warpPlusMethod('io', 'getVideoInfo', options => {
   return options
 }, data => {
   return {
+    orientation: data.orientation,
+    type: data.type,
     duration: data.duration,
-    fps: data.fps || 30,
+    size: data.size / 1024,
     height: data.height,
     width: data.width,
-    size: data.size
+    fps: data.fps || 30,
+    bitrate: data.bitrate
   }
 })