@dcloudio/uni-cli-shared 2.0.2-alpha-5010420260626002 → 2.0.2-alpha-5020120260710001

package/components/ad.mixin.mp-weixin.js

@@ -1,4 +1,17 @@
 /* eslint-disable no-undef */
+import {
+  canShowHalfScreenModal,
+  isHalfScreenModalShowing,
+  markHalfScreenModalConfirmed,
+  markHalfScreenModalDismissed,
+  markHalfScreenModalShowing,
+  queueHalfScreenModalOpenOptions,
+  resetHalfScreenModalSession,
+  resolveHalfScreenModalContent,
+  takePendingHalfScreenModalOpenOptions,
+  unlockHalfScreenModalShowing
+} from './half-screen-modal.js'
+
 const adPlugin = requirePlugin('uni-ad')
 
 const EventType = {
@@ -16,7 +29,8 @@ const AdType = {
 const ProviderType = {
   WeChat: 10018,
   UserWeChat: 10017,
-  ShanHu: 10020
+  ShanHu: 10020,
+  HalfScreen: 10032
 }
 
 const ActionType = {
@@ -26,6 +40,11 @@ const ActionType = {
   Click: '41'
 }
 
+/** 微信广告无填充错误码 */
+const WxAdErrorCode = {
+  NoFill: 1004
+}
+
 export default {
   options: {
     virtualHost: true
@@ -75,16 +94,20 @@ export default {
       userUnitId: '',
       customFullscreen: '',
       wxchannel: false,
-      errorMessage: null
+      errorMessage: null,
+      isHalfScreen: false
     }
   },
   created () {
+    resetHalfScreenModalSession()
     this._ad = null
     this._loading = false
     this._wxRewardedAd = null
     this._wxInterstitialAd = null
     this._userInvokeShowFlag = false
     this._providerType = ProviderType.ShanHu
+    this._halfScreenOpening = false
+    this._halfScreenOpeningTimer = null
     if (this.preload && this._canCreateAd()) {
       this.load()
     }
@@ -106,6 +129,11 @@ export default {
 
     show (e) {
       this.errorMessage = null
+      const plugin = this.selectComponent('.uniad-plugin')
+      if (this._isHalfScreenAd(plugin)) {
+        this._userInvokeShowFlag = false
+        return
+      }
       if (this.loading) {
         this._userInvokeShowFlag = true
         return
@@ -120,6 +148,9 @@ export default {
     },
 
     _onclick () {
+      if (this.isHalfScreen) {
+        return
+      }
       this.show()
     },
 
@@ -142,12 +173,334 @@ export default {
       return (typeof this.urlCallback === 'object' && Object.keys(this.urlCallback).length > 0)
     },
 
+    /**
+     * 按 provider 从 acsv4 配置列表查找广告项
+     * @param {Array} list 配置数组
+     * @param {number} provider 渠道 provider
+     */
+    _findAdItemByProvider (list, provider) {
+      if (!Array.isArray(list)) {
+        return null
+      }
+      return list.find(item => Number(item.provider) === Number(provider)) || null
+    },
+
+    /**
+     * 是否为微信广告无填充 errCode 1004
+     * @param {Object} err 错误对象
+     */
+    _isWxAdNoFillError (err) {
+      if (!err) {
+        return false
+      }
+      const detail = err.detail || err
+      return Number(detail.errCode) === WxAdErrorCode.NoFill
+    },
+
+    /**
+     * 代运营无填充时尝试半屏兜底
+     * @param {Object} plugin uniad-plugin 实例
+     * @param {Object} err 错误对象
+     */
+    _tryHalfScreenFallback (plugin, err) {
+      if (!plugin || !plugin.tryHalfScreenFallback) {
+        return false
+      }
+      const detail = err && (err.detail || err)
+      if (!this._isWxAdNoFillError(detail)) {
+        return false
+      }
+      // 半屏切换与 load 事件由插件 triggerEvent(load) → _onmpload 统一处理
+      return plugin.tryHalfScreenFallback(detail)
+    },
+
+    /**
+     * 处理代运营微信广告错误，无填充时走半屏兜底
+     * @param {Object} err 错误对象
+     * @param {string} reportType 上报类型
+     */
+    _handleUserWxAdError (err, reportType) {
+      this.loading = false
+      const plugin = this.selectComponent('.uniad-plugin')
+      if (this._tryHalfScreenFallback(plugin, err)) {
+        return true
+      }
+      this.errorMessage = JSON.stringify(err)
+      this._dispatchEvent(EventType.Error, err)
+      if (reportType) {
+        this._report(reportType, err)
+      }
+      return false
+    },
+
+    /**
+     * 切换为半屏广告模式
+     */
+    _setHalfScreenMode () {
+      this.isHalfScreen = true
+      this._providerType = ProviderType.HalfScreen
+      this.userwx = false
+      this.wxchannel = false
+      this.loading = false
+      this._userInvokeShowFlag = false
+    },
+
+    /**
+     * 是否半屏广告
+     * @param {Object} plugin uniad-plugin 实例
+     */
+    _isHalfScreenAd (plugin) {
+      return this._providerType === ProviderType.HalfScreen || !!(
+        plugin &&
+        plugin.getHalfScreenConfig &&
+        plugin.getHalfScreenConfig()
+      )
+    },
+
+    /**
+     * 用户点击半屏占位（插件 halfScreenTap 事件）
+     * @param {Object} e 事件对象
+     */
+    _onHalfScreenTap (e) {
+      const openOptions = e.detail && e.detail.openOptions
+      if (!openOptions) {
+        return
+      }
+      this._openTargetMiniProgramInHost(openOptions)
+    },
+
+    /**
+     * 开始打开小程序防抖锁
+     */
+    _beginMiniProgramOpening () {
+      this._halfScreenOpening = true
+      this._halfScreenOpeningTimer = setTimeout(() => {
+        this._resetHalfScreenOpening()
+      }, 3000)
+    },
+
+    /**
+     * 用户手动触发：优先半屏打开，失败则 navigateToMiniProgram 兜底
+     * @param {Object} openOptions 打开参数
+     */
+    _openTargetMiniProgramInHost (openOptions) {
+      if (this._halfScreenOpening) {
+        return
+      }
+      if (!openOptions || !openOptions.appId) {
+        this._dispatchEvent(EventType.Error, {
+          errMsg: 'mini program openOptions unavailable'
+        })
+        return
+      }
+      const plugin = this.selectComponent('.uniad-plugin')
+      this._openHalfScreenEmbeddedInHost(openOptions, plugin)
+    },
+
+    /**
+     * 半屏嵌入打开 wx.openEmbeddedMiniProgram
+     * @param {Object} openOptions 打开参数
+     * @param {Object} plugin uniad-plugin 实例
+     */
+    _openHalfScreenEmbeddedInHost (openOptions, plugin) {
+      if (typeof wx.openEmbeddedMiniProgram !== 'function') {
+        this._openMiniProgramDirectInHost(openOptions, plugin)
+        return
+      }
+      this._beginMiniProgramOpening()
+      wx.openEmbeddedMiniProgram({
+        appId: openOptions.appId,
+        path: openOptions.path,
+        extraData: openOptions.extraData || {},
+        success: (res) => {
+          this._resetHalfScreenOpening()
+          if (plugin && plugin.notifyHalfScreenOpenSuccess) {
+            plugin.notifyHalfScreenOpenSuccess(res)
+          }
+        },
+        fail: (err) => {
+          if (this._isMiniProgramOpenCancel(err)) {
+            this._resetHalfScreenOpening()
+            this._notifyHalfScreenOpenResult(plugin, err)
+            return
+          }
+          this._openMiniProgramDirectInHost(openOptions, plugin, err)
+        }
+      })
+    },
+
+    /**
+     * 直接打开小程序 wx.navigateToMiniProgram（半屏未过审等场景兜底）
+     * @param {Object} openOptions 打开参数
+     * @param {Object} plugin uniad-plugin 实例
+     * @param {Object} fromErr 半屏打开失败时的错误
+     */
+    _openMiniProgramDirectInHost (openOptions, plugin, fromErr) {
+      if (typeof wx.navigateToMiniProgram !== 'function') {
+        this._resetHalfScreenOpening()
+        this._notifyHalfScreenOpenResult(plugin, fromErr || {
+          errMsg: 'navigateToMiniProgram not supported'
+        })
+        return
+      }
+      if (!this._halfScreenOpening) {
+        this._beginMiniProgramOpening()
+      }
+      wx.navigateToMiniProgram({
+        appId: openOptions.appId,
+        path: openOptions.path,
+        extraData: openOptions.extraData || {},
+        success: (res) => {
+          this._resetHalfScreenOpening()
+          if (plugin && plugin.notifyHalfScreenOpenSuccess) {
+            plugin.notifyHalfScreenOpenSuccess(res, { isDirect: true })
+          }
+        },
+        fail: (err) => {
+          this._resetHalfScreenOpening()
+          this._notifyHalfScreenOpenResult(plugin, err)
+        }
+      })
+    },
+
+    /**
+     * 清除半屏打开锁定时器
+     */
+    _clearHalfScreenOpeningTimer () {
+      if (this._halfScreenOpeningTimer) {
+        clearTimeout(this._halfScreenOpeningTimer)
+        this._halfScreenOpeningTimer = null
+      }
+    },
+
+    /**
+     * 重置半屏打开锁
+     */
+    _resetHalfScreenOpening () {
+      this._halfScreenOpening = false
+      this._clearHalfScreenOpeningTimer()
+    },
+
+    /**
+     * 是否为打开/跳转小程序时用户点击取消（fail cancel）
+     * @param {Object} err 失败回调对象
+     */
+    _isMiniProgramOpenCancel (err) {
+      const msg = (err && err.errMsg) || ''
+      return typeof msg === 'string' && msg.indexOf('fail cancel') !== -1
+    },
+
+    /**
+     * 通知插件半屏打开失败或用户取消
+     * @param {Object} plugin uniad-plugin 实例
+     * @param {Object} err 失败回调对象
+     */
+    _notifyHalfScreenOpenResult (plugin, err) {
+      if (this._isMiniProgramOpenCancel(err)) {
+        if (plugin && plugin.notifyHalfScreenOpenCancel) {
+          plugin.notifyHalfScreenOpenCancel(err)
+        } else if (plugin && plugin.notifyHalfScreenOpenFail) {
+          plugin.notifyHalfScreenOpenFail(err)
+        } else {
+          this._dispatchEvent(EventType.Close, { type: 'userCancel', detail: err })
+        }
+        return
+      }
+      if (plugin && plugin.notifyHalfScreenOpenFail) {
+        plugin.notifyHalfScreenOpenFail(err)
+      } else {
+        this._dispatchEvent(EventType.Error, err)
+      }
+    },
+
+    /**
+     * 插件半屏占位就绪，同步宿主状态并隐藏 ad-custom
+     */
+    _onHalfScreenReady () {
+      this._setHalfScreenMode()
+    },
+
+    /**
+     * 插件 all_show 双广告：ad 配置就绪后并行弹窗
+     * @param {Object} e 事件对象
+     */
+    _onHalfScreenModal (e) {
+      const detail = e.detail || e
+      const openOptions = detail.openOptions
+      if (openOptions) {
+        this._tryShowHalfScreenModal(openOptions)
+      }
+    },
+
+    /**
+     * 尝试展示排队中的半屏弹窗
+     */
+    _processPendingHalfScreenModal () {
+      const pending = takePendingHalfScreenModalOpenOptions()
+      if (pending) {
+        setTimeout(() => {
+          this._tryShowHalfScreenModal(pending)
+        }, 50)
+      }
+    },
+
+    /**
+     * 宿主层统一调用 uni.showModal 引导打开半屏
+     * @param {Object} openOptions 打开半屏/直达小程序参数
+     * @param {number} retryCount showModal 失败重试次数
+     */
+    _tryShowHalfScreenModal (openOptions, retryCount = 0) {
+      if (!openOptions || !openOptions.appId) {
+        return
+      }
+      const appId = openOptions.appId
+      if (!canShowHalfScreenModal(appId)) {
+        return
+      }
+      if (isHalfScreenModalShowing()) {
+        queueHalfScreenModalOpenOptions(openOptions)
+        return
+      }
+      markHalfScreenModalShowing(appId)
+      uni.showModal({
+        title: '提示',
+        content: resolveHalfScreenModalContent(openOptions.msg),
+        confirmText: '继续',
+        cancelText: '取消',
+        success: (res) => {
+          if (res.confirm) {
+            markHalfScreenModalConfirmed()
+            this._openTargetMiniProgramInHost(openOptions)
+          } else {
+            markHalfScreenModalDismissed(appId)
+          }
+        },
+        fail: () => {
+          unlockHalfScreenModalShowing(appId)
+          if (retryCount < 1) {
+            setTimeout(() => {
+              this._tryShowHalfScreenModal(openOptions, retryCount + 1)
+            }, 300)
+          } else {
+            this._processPendingHalfScreenModal()
+          }
+        }
+      })
+    },
+
     _onmpload (e) {
       this.loading = false
+      const plugin = this.selectComponent('.uniad-plugin')
+      if (plugin && plugin.getHalfScreenConfig && plugin.getHalfScreenConfig()) {
+        this._setHalfScreenMode()
+      }
       this._dispatchEvent(EventType.Load, {})
       this._report(ActionType.AdRequest)
       if (this._userInvokeShowFlag) {
         this._userInvokeShowFlag = false
+        if (this.isHalfScreen) {
+          return
+        }
         setTimeout(() => {
           this.show()
         }, 1)
@@ -185,15 +538,22 @@ export default {
     },
 
     _onmperror (e) {
-      this.loading = false
-      this.errorMessage = JSON.stringify(e.detail)
-      this._dispatchEvent(EventType.Error, e.detail)
-      this._report(ActionType.AdRequest, e.detail)
+      const detail = e.detail || e
+      if (this._handleUserWxAdError(detail, ActionType.AdRequest)) {
+        return
+      }
+      if (this._isMiniProgramOpenCancel(detail)) {
+        return
+      }
+      this._dispatchEvent(EventType.Error, detail)
     },
 
     _onnextchannel (e) {
+      const adData = this._findAdItemByProvider(e.detail, ProviderType.UserWeChat)
+      if (!adData) {
+        return
+      }
       this.wxchannel = true
-      const adData = e.detail[0]
       this.$nextTick(() => {
         if (adData.provider === 10017) {
           this._providerType = ProviderType.UserWeChat
@@ -311,8 +671,7 @@ export default {
           this._wxRewardedAd.show().then(() => {
             this._report(ActionType.Show)
           }).catch((err) => {
-            this._dispatchEvent(EventType.Error, err)
-            this._report(ActionType.Show, err)
+            this._handleUserWxAdError(err, ActionType.Show)
           })
           break
         case AdType.Interstitial:
@@ -323,8 +682,7 @@ export default {
           this._wxInterstitialAd.show().then(() => {
             this._report(ActionType.Show)
           }).catch((err) => {
-            this._dispatchEvent(EventType.Error, err)
-            this._report(ActionType.Show, err)
+            this._handleUserWxAdError(err, ActionType.Show)
           })
           break
       }
@@ -349,9 +707,7 @@ export default {
       })
 
       this._wxRewardedAd.onError(err => {
-        this.loading = false
-        this.errorMessage = JSON.stringify(err)
-        this._dispatchEvent(EventType.Error, err)
+        this._handleUserWxAdError(err, ActionType.AdRequest)
       })
 
       this._wxRewardedAd.onClose(res => {
@@ -389,10 +745,7 @@ export default {
       })
 
       this._wxInterstitialAd.onError(err => {
-        this.loading = false
-        this.errorMessage = JSON.stringify(err)
-        this._dispatchEvent(EventType.Error, err)
-        this._report(ActionType.AdRequest, err)
+        this._handleUserWxAdError(err, ActionType.AdRequest)
       })
 
       this._wxInterstitialAd.onClose(res => {
@@ -400,8 +753,7 @@ export default {
       })
 
       this._wxInterstitialAd.load().catch((err) => {
-        this._dispatchEvent(EventType.Error, err)
-        this._report(ActionType.AdRequest, err)
+        this._handleUserWxAdError(err, ActionType.AdRequest)
       })
 
       this.loading = true

package/components/half-screen-modal.js

@@ -0,0 +1,121 @@
+/** 半屏弹窗默认文案（msg 缺失或为空时使用） */
+export const HALF_SCREEN_MODAL_DEFAULT_MSG = '即将为您打开其他小程序，是否继续？'
+
+/**
+ * 解析半屏弹窗展示文案
+ * @param {string} msg 服务端或插件下发的 msg
+ * @returns {string}
+ */
+export function resolveHalfScreenModalContent (msg) {
+  if (typeof msg === 'string' && msg.trim()) {
+    return msg.trim()
+  }
+  return HALF_SCREEN_MODAL_DEFAULT_MSG
+}
+
+/** 半屏弹窗页面级去重（组件重新挂载时重置，取消后当次不再弹） */
+const _state = {
+  dismissedAppIds: new Set(),
+  showingAppId: null,
+  pendingOpenOptions: null
+}
+
+/**
+ * 重置半屏弹窗会话（ad 组件新建 / 页面重新进入时调用）
+ */
+export function resetHalfScreenModalSession () {
+  _state.dismissedAppIds.clear()
+  _state.showingAppId = null
+  _state.pendingOpenOptions = null
+}
+
+/**
+ * 是否允许展示半屏弹窗
+ * @param {string} appId 目标小程序 appId
+ * @returns {boolean}
+ */
+export function canShowHalfScreenModal (appId) {
+  if (!appId) {
+    return false
+  }
+  if (_state.dismissedAppIds.has(appId)) {
+    return false
+  }
+  return true
+}
+
+/**
+ * 是否有半屏弹窗正在展示
+ * @returns {boolean}
+ */
+export function isHalfScreenModalShowing () {
+  return !!_state.showingAppId
+}
+
+/**
+ * 标记半屏弹窗正在展示
+ * @param {string} appId 目标小程序 appId
+ */
+export function markHalfScreenModalShowing (appId) {
+  _state.showingAppId = appId
+}
+
+/**
+ * 解除半屏弹窗展示锁
+ * @param {string} appId 目标小程序 appId
+ */
+export function unlockHalfScreenModalShowing (appId) {
+  if (_state.showingAppId === appId) {
+    _state.showingAppId = null
+  }
+}
+
+/**
+ * 标记半屏弹窗用户已确认（不阻止下次进入页面再弹）
+ */
+export function markHalfScreenModalConfirmed () {
+  _state.showingAppId = null
+  _state.pendingOpenOptions = null
+}
+
+/**
+ * 标记半屏弹窗用户取消（当前会话不再弹）
+ * @param {string} appId 目标小程序 appId
+ */
+export function markHalfScreenModalDismissed (appId) {
+  if (appId) {
+    _state.dismissedAppIds.add(appId)
+  }
+  _state.showingAppId = null
+  _state.pendingOpenOptions = null
+}
+
+/**
+ * 排队等待展示半屏弹窗（同 appId 多实例竞态时）
+ * @param {Object} openOptions 打开参数
+ */
+export function queueHalfScreenModalOpenOptions (openOptions) {
+  if (!openOptions || !openOptions.appId) {
+    return
+  }
+  if (_state.dismissedAppIds.has(openOptions.appId)) {
+    return
+  }
+  _state.pendingOpenOptions = openOptions
+}
+
+/**
+ * 取出并排清空排队中的半屏弹窗参数
+ * @returns {Object|null}
+ */
+export function takePendingHalfScreenModalOpenOptions () {
+  const pending = _state.pendingOpenOptions
+  _state.pendingOpenOptions = null
+  if (!pending || !pending.appId) {
+    return null
+  }
+  if (_state.dismissedAppIds.has(pending.appId)) {
+    return null
+  }
+  return pending
+}

package/components/uniad.vue

@@ -1,5 +1,5 @@
 <template>
-  <view :class="[customFullscreen?'uni-ad-custom':'',customFullscreen]" :style="style" @click="onclick">
+  <view :class="[customFullscreen?'uni-ad-custom':'',customFullscreen]" :style="style" @click="_onclick">
     <uniad-plugin
       class="uniad-plugin"
       :adpid="adpid"
@@ -10,9 +10,12 @@
       @error="_onmperror"
       @nextChannel="_onnextchannel"
       @customFullscreen="_customFullscreen"
+      @halfScreenReady="_onHalfScreenReady"
+      @halfScreenTap="_onHalfScreenTap"
+      @halfScreenModal="_onHalfScreenModal"
     />
     <!-- #ifdef MP-WEIXIN -->
-    <ad-custom v-if="userwx" :adIntervals="adIntervals" :unit-id="userUnitId" class="uni-ad-custom" data-com-type="wx" :class="[customFullscreen]" @load="_onmpload" @error="_onmperror"></ad-custom>
+    <ad-custom v-if="userwx && !isHalfScreen" :adIntervals="adIntervals" :unit-id="userUnitId" class="uni-ad-custom" data-com-type="wx" :class="[customFullscreen]" @load="_onmpload" @error="_onmperror"></ad-custom>
     <!-- <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" :class="[customFullscreen]" data-com-type="wx" @load="_onmpload" @error="_onwxchannelerror"></uniad-plugin-wx> -->
     <!-- #endif -->
   </view>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-alpha-5010420260626002",
+  "version": "2.0.2-alpha-5020120260710001",
   "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": "e8896942ca8268595233f9ec566d8ae0a475696d"
+  "gitHead": "cf7b7801e8bc5a7e8b9cac638f4e3bece2599e42"
 }