@dcloudio/uni-cli-shared 2.0.1-alpha-36020220830002 → 2.0.1-alpha-36120220907001

package/components/ad.mixin.mp.js

@@ -27,6 +27,12 @@ export default {
     loadnext: {
       type: [Boolean, String],
       default: false
+    },
+    urlCallback: {
+      type: Object,
+      default () {
+        return {}
+      }
     }
   },
   data () {
@@ -58,7 +64,31 @@ export default {
     show () {
       this.errorMessage = null
       this._ad = this.selectComponent('.uniad-plugin')
-      this._ad.show()
+      if (this._hasCallback()) {
+        const userCryptoManager = wx.getUserCryptoManager()
+        userCryptoManager.getLatestUserKey({
+          success: ({
+            encryptKey,
+            iv,
+            version,
+            expireTime
+          }) => {
+            this._ad.show({
+              userId: this.urlCallback.userId || '',
+              extra: this.urlCallback.extra || '',
+              encryptKey,
+              iv,
+              version,
+              expireTime
+            })
+          },
+          fail: (err) => {
+            this._dispatchEvent(EventType.Error, err)
+          }
+        })
+      } else {
+        this._ad.show()
+      }
     },
 
     _onclick () {
@@ -80,6 +110,11 @@ export default {
       return result
     },
 
+    _hasCallback () {
+      return false
+      // return (typeof this.urlCallback === 'object' && Object.keys(this.urlCallback).length > 0)
+    },
+
     _onmpload (e) {
       this.loading = false
       this._dispatchEvent(EventType.Load, {})
@@ -87,6 +122,31 @@ export default {
 
     _onmpclose (e) {
       this._dispatchEvent(EventType.Close, e.detail)
+      if (e.detail.adsdata) {
+        const adv = e.detail.adv
+        const adsdata = e.detail.adsdata
+        const version = e.detail.version
+
+        /* eslint-disable no-undef */
+        uniCloud.callFunction({
+          name: 'uniAdCallback',
+          data: {
+            adv: adv,
+            adsdata: adsdata,
+            version: version
+          },
+          secretType: 'both',
+          success: (res) => {
+          },
+          fail: (err) => {
+            this._dispatchEvent(EventType.Error, err)
+          }
+        })
+
+        delete e.detail.adv
+        delete e.detail.adsdata
+        delete e.detail.version
+      }
     },
 
     _onmperror (e) {

package/lib/preprocess.js

@@ -5,7 +5,10 @@ const DEFAULT_KEYS = [
   'APP',
   'APP-PLUS-NVUE',
   'APP-VUE',
-  'APP-NVUE'
+  'APP-NVUE',
+  'APP-ANDROID',
+  'APP-IOS',
+  'WEB'
 ]
 
 function normalize (name) {
@@ -44,14 +47,25 @@ module.exports = function initPreprocess (name, platforms, userDefines = {}) {
     nvueContext.APP_PLUS = true
     nvueContext.APP_NVUE = true
     nvueContext.APP_PLUS_NVUE = true
-  }
 
+    if (process.env.UNI_APP_PLATFORM === 'android') {
+      defaultContext.APP_ANDROID = true
+    } else if (process.env.UNI_APP_PLATFORM === 'ios') {
+      defaultContext.APP_IOS = true
+    } else {
+      defaultContext.APP_ANDROID = true
+      defaultContext.APP_IOS = true
+    }
+  }
+  if (name === 'h5') {
+    defaultContext.WEB = true
+  }
   if (name.startsWith('mp-')) {
     vueContext.MP = true
   }
 
   if (name.startsWith('app-')) {
-    vueContext.APP = true
+    vueContext.APP = true
     nvueContext.APP = true
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-alpha-36020220830002",
+  "version": "2.0.1-alpha-36120220907001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -25,5 +25,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "c3cd2073bb4e67dcb6d6a1ac9e98a461fc4ebd33"
+  "gitHead": "2290dd0b6f192129af9c6be83819277dff40fc66"
 }