@dcloudio/uni-cli-shared 2.0.2-5000720260410001 → 2.0.2-5010520260709001

package/components/ad-interstitial.web.js

@@ -41,31 +41,44 @@ export default {
   created () {
     this._pc = {}
     this._pl = []
+    this._interstitialData = {}
+    this._adShow = false
+    this._id = ''
     this._loadData()
   },
   methods: {
+    /** 对外 load：仅派发 load 事件（与历史行为一致） */
     load () {
       this._dispatchEvent(EventType.Load, {})
     },
 
+    /** 展示插屏：在 SDK 与素材就绪后调用 GDT NATIVE.renderAd */
     show () {
       this.errorMessage = null
 
-      const data = this._pl[0]
-      const providerConfig = this._pc[data.a1][data.t]
-
-      AdScript.instance.load(data.t, providerConfig.script, () => {
-        this._renderData(data)
-      }, (err) => {
-        this.errorMessage = err.message
-        this._dispatchEvent(EventType.Error, err)
-      })
+      const res = this._interstitialData
+      // 插屏广告返回格式：{ ret: 0, data: [...] }
+      if (this._adShow) {
+        if (res && res.ret === 0) {
+          const id = this._createView()
+          // 直接调用 renderAd 渲染插屏广告
+          window.TencentGDT.NATIVE.renderAd(res.data[0], id)
+          this._dispatchEvent(EventType.Load, {})
+        } else {
+          this.errorMessage = res ? `Error code: ${res.ret}` : 'No advertisement'
+          this._dispatchEvent(EventType.Error, res || { errMsg: 'No advertisement' })
+        }
+      } else {
+        this._dispatchEvent(EventType.Error, this.errorMessage)
+      }
     },
 
+    /** 点击插屏区域时尝试展示广告 */
     _onclick () {
       this.show()
     },
 
+    /** 按 adpid 拉取 H5 广告配置并加载优量汇脚本、预请求素材 */
     _loadData (adpid) {
       this.loading = true
       const id = adpid || this.adpid
@@ -73,6 +86,25 @@ export default {
         this._pc = a
         this._pl = b
         this.loading = false
+
+        const data = this._pl[0]
+        const providerConfig = this._pc[data.a1]
+
+        if (data.a1 === '2') {
+          if (!window.TencentGDT) {
+            window.TencentGDT = window.TencentGDT || []
+          }
+          // 优量汇（广点通）
+          AdScript.instance.load(data.a1, providerConfig.script, () => {
+            this._adShow = true
+            // 脚本加载成功后初始化
+            this._renderGdt(data)
+          }, (err) => {
+            this._adShow = false
+            this.errorMessage = err.message
+            this._dispatchEvent(EventType.Error, err)
+          })
+        }
       }, (err) => {
         this.loading = false
         this.errorMessage = err
@@ -80,33 +112,29 @@ export default {
       })
     },
 
-    _renderData (data) {
-      const id = this._createView()
-
-      const coral = new window.CoralAdv({
-        app_id: data.a2,
-        placement_id: data.a3,
-        type: data.a4,
-        display_type: data.a5,
-        container_id: id,
-        count: 1
-      })
-      coral.ready().then(async (res) => {
-        if (res.ret === 0) {
-        } else {
-          this._dispatchEvent(EventType.Error, res)
+    /** 向 TencentGDT 队列提交插屏 native 请求，onComplete 写入 _interstitialData */
+    _renderGdt (data) {
+      window.TencentGDT.push({
+        placement_id: data.a3, // 广告位ID
+        app_id: data.a2, // APP ID
+        type: 'native',
+        display_type: 'interstitial', // 插屏广告
+        count: 1,
+        onComplete: (res) => {
+          // 缓存数据
+          this._interstitialData = res
         }
-      }).catch((err) => {
-        this._dispatchEvent(EventType.Error, err)
       })
     },
 
+    /** 以小程序风格 detail 包装后向父组件派发事件 */
     _dispatchEvent (type, data) {
       this.$emit(type, {
         detail: data
       })
     },
 
+    /** 在容器内创建带随机 id 的 DOM 节点，供 renderAd 挂载 */
     _createView () {
       const id = this._randomId()
       const adView = document.createElement('div')
@@ -116,6 +144,7 @@ export default {
       return id
     },
 
+    /** 生成 renderAd 容器 DOM id */
     _randomId () {
       let result = ''
       for (let i = 0; i < 4; i++) {
@@ -130,6 +159,7 @@ export default {
 // let IS = 0
 
 class AdConfig {
+  /** @returns {AdConfig} 全局单例 */
   static get instance () {
     if (this._instance == null) {
       this._instance = new AdConfig()
@@ -146,10 +176,12 @@ class AdConfig {
     this._callbacks = []
   }
 
+  /** @returns 当前内存中的配置体（服务端返回的 data） */
   get adConfig () {
     return this._adConfig
   }
 
+  /** @returns {boolean} 本地缓存是否超过 CACHE_TIME */
   get isExpired () {
     if (this._adConfig == null) {
       return true
@@ -157,6 +189,7 @@ class AdConfig {
     return (Math.abs(Date.now() - this._adConfig.last) > this.CACHE_TIME)
   }
 
+  /** 从 localStorage 恢复未过期的配置到内存 */
   _init () {
     var config = this._getConfig()
     if (config === null || !config.last) {
@@ -168,6 +201,12 @@ class AdConfig {
     }
   }
 
+  /**
+   * 按 adpid 获取配置：优先内存/缓存命中，否则请求 ah5v2 并排队回调
+   * @param {string|number} adpid
+   * @param {(a: object, b: object[]) => void} success
+   * @param {(err: object) => void} fail
+   */
   get (adpid, success, fail) {
     // IC++
     if (this._adConfig != null) {
@@ -187,6 +226,7 @@ class AdConfig {
     this._loadAdConfig(adpid)
   }
 
+  /** 用当前 _adConfig 解析 adpid 并调用 success 或 fail */
   _doCallback (adpid, success, fail) {
     // IS++
     var { a, b } = this._adConfig
@@ -197,6 +237,7 @@ class AdConfig {
     }
   }
 
+  /** 请求远端 H5 广告配置并刷新内存与等待队列 */
   _loadAdConfig (adpid) {
     if (this._isLoading === true) {
       return
@@ -242,6 +283,7 @@ class AdConfig {
     })
   }
 
+  /** @returns {{ last: number, data: object }|null} localStorage 中的包装结构 */
   _getConfig () {
     if (!navigator.cookieEnabled || !window.localStorage) {
       return null
@@ -250,6 +292,7 @@ class AdConfig {
     return data ? JSON.parse(data) : null
   }
 
+  /** 将服务端 data 与当前时间写入 localStorage */
   _setConfig (data) {
     if (!navigator.cookieEnabled || !window.localStorage) {
       return null
@@ -261,7 +304,8 @@ class AdConfig {
   }
 }
 Object.assign(AdConfig.prototype, {
-  URL: 'https://hac1.dcloud.net.cn/ah5',
+  // 旧版 https://hac1.dcloud.net.cn/ah5 已废弃，配置迁移至 v2（与 Vue3 H5 插屏一致）
+  URL: 'https://hac1.dcloud.net.cn/ah5v2',
   KEY: 'uni_app_ad_config',
   CACHE_TIME: 1000 * 60 * 10,
   ERROR_INVALID_ADPID: {
@@ -270,6 +314,7 @@ Object.assign(AdConfig.prototype, {
 })
 
 class AdScript {
+  /** @returns {AdScript} 脚本加载器单例 */
   static get instance () {
     if (this._instance == null) {
       this._instance = new AdScript()
@@ -283,6 +328,10 @@ class AdScript {
     this._cache = {}
   }
 
+  /**
+   * 按渠道加载广告 SDK script，已缓存则同步 success
+   * @param {string} provider 渠道标识（如优量汇为 '2'）
+   */
   load (provider, script, success, fail) {
     if (this._cache[provider] === undefined) {
       this.loadScript(provider, script)
@@ -301,10 +350,21 @@ class AdScript {
     }
   }
 
+  /** 向 document 插入 script 节点并处理 onload/onerror 队列 */
   loadScript (provider, script) {
     this._cache[provider] = 0
+    const domid = 'uniad_provider' + provider
+    // 判断是否已经加载平台sdk
+    const adScriptDom = document.getElementById(domid)
+    const src = adScriptDom && adScriptDom.getAttribute('src')
+    if (src) {
+      this._cache[provider] = 1
+      return
+    }
+
     var ads = document.createElement('script')
-    ads.setAttribute('id', 'uniad_provider' + provider)
+    ads.setAttribute('id', domid)
+
     for (const var1 in script) {
       ads.setAttribute(var1, script[var1])
     }

package/lib/platform.js

@@ -81,7 +81,10 @@ function isEnableConsole () {
     process.env.NODE_ENV === 'development' &&
     process.env.UNI_SOCKET_HOSTS &&
     process.env.UNI_SOCKET_PORT &&
-    process.env.UNI_SOCKET_ID
+    process.env.UNI_SOCKET_ID &&
+    // 环境变量传入有bug，临时屏蔽安卓平台开启 uni-console
+    process.env.UNI_APP_PLATFORM !== 'android' &&
+    process.env.UNI_APP_PLATFORM !== 'ios'
   )
 }
 
@@ -94,6 +97,7 @@ const {
   vueContext: preprocessContext,
   nvueContext: nvuePreprocessContext
 } = global.uniPlugin.preprocess
+
 // TODO 暂时保留原有导出，减少影响，后续再整理一下
 module.exports = {
   normalizeNodeModules,
@@ -209,8 +213,9 @@ module.exports = {
     if (!process.env.UNI_USING_STAT) {
       return ''
     }
-    return process.env.UNI_USING_STAT === '2' ? 'import \'@dcloudio/uni-stat/dist/uni-cloud-stat.es.js\';'
-      : 'import \'@dcloudio/uni-stat/dist/uni-stat.es.js\';'
+    return process.env.UNI_USING_STAT === 'private'
+      ? 'import \'@dcloudio/uni-stat/dist/uni-cloud-stat.es.js\';'
+      : 'import \'@dcloudio/uni-stat/dist/uni-stat-public.es.js\';'
   },
   getPlatformPush () {
     if (process.env.UNI_PUSH_V1) {

package/lib/stat.js

@@ -0,0 +1,21 @@
+const { hasOwn } = require('./util')
+
+/**
+ * 解析统计 enable 开关。
+ * 1. 子平台 uniStatistics.enable 显式存在 → 以子为准
+ * 2. 否则根 uniStatistics.enable 显式存在 → 继承根
+ * 3. 否则默认开启
+ */
+function resolveStatEnable (rootStat, platformStat) {
+  if (platformStat && hasOwn(platformStat, 'enable')) {
+    return platformStat.enable === true
+  }
+  if (rootStat && hasOwn(rootStat, 'enable')) {
+    return rootStat.enable === true
+  }
+  return true
+}
+
+module.exports = {
+  resolveStatEnable
+}

package/lib/style.js

@@ -36,9 +36,9 @@ function createRpx2Unit (unit, unitRatio, unitPrecision) {
    * @param {string | number} val
    * @returns {string}
    */
-  return (val) => {
+  return function (val) {
     if (unitRE.test(val)) {
-      return val.replace(unitRE, (m, $1) => {
+      return val.replace(unitRE, function (m, $1) {
         if (!$1) {
           return m
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-5000720260410001",
+  "version": "2.0.2-5010520260709001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -27,5 +27,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "82deb22abba40f01d10a6a4deb83b418e0adc266"
+  "gitHead": "f17eaf4bf390726fa12db98e6efbe0557841bed0"
 }