jyj-components 1.0.2 → 1.0.3

package/src/ad-rewarded-video/index.js

@@ -22,7 +22,8 @@ Component({
     ads: [],
     currentAd: {},
     currentAdIndex: 0,
-    currentAdShowCount: 0
+    currentAdShowCount: 0,
+    wxAdFailed: false  // 微信广告失败标记（仅内存，不持久化）
   },
   lifetimes: {
     async attached() {
@@ -31,6 +32,18 @@ Component({
     }
   },
   methods: {
+    checkAndResetDaily() {
+      return adBase.checkAndResetDaily.call(this)
+    },
+    isWxAdFailed() {
+      return adBase.isWxAdFailed.call(this)
+    },
+    markWxAdFailed() {
+      adBase.markWxAdFailed.call(this)
+    },
+    isAllCustomAdsReachedLimit() {
+      return adBase.isAllCustomAdsReachedLimit.call(this)
+    },
     restoreAdState() {
       adBase.restoreAdState.call(this)
     },

package/src/ad-splash/index.js

@@ -14,15 +14,52 @@ Component({
     currentAdIndex: 0,
     currentAdShowCount: 0,
     countDown: 5,
-    splashStatus: true
+    splashStatus: true,
+    adBannerTop: 60,
+    wxAdFailed: false  // 微信广告失败标记（仅内存，不持久化）
   },
   lifetimes: {
     async attached() {
-      await adBase.initAds.call(this)
-      this.startCountDown()
+      this.calculateAdBannerTop()
+
+      const canUse = this.canUseCoverAdAPI()
+
+      if (canUse){
+        setTimeout(() => {
+          wx.getShowSplashAdStatus({
+            success: async res => {
+              if (res.status === 'fail'){
+                await adBase.initAds.call(this)
+                this.startCountDown()
+              } else {
+                this.jump()
+              }
+            },
+            fail: async err => {
+              await adBase.initAds.call(this)
+              this.startCountDown()
+            }
+          })
+        }, 100)
+      } else {
+        await adBase.initAds.call(this)
+        this.startCountDown()
+      }
     }
   },
   methods: {
+    checkAndResetDaily() {
+      return adBase.checkAndResetDaily.call(this)
+    },
+    isWxAdFailed() {
+      return adBase.isWxAdFailed.call(this)
+    },
+    markWxAdFailed() {
+      adBase.markWxAdFailed.call(this)
+    },
+    isAllCustomAdsReachedLimit() {
+      return adBase.isAllCustomAdsReachedLimit.call(this)
+    },
     restoreAdState() {
       adBase.restoreAdState.call(this)
     },
@@ -55,6 +92,49 @@ Component({
       }, 1100)
     },
 
+    calculateAdBannerTop() {
+      try {
+        const menuRect = wx.getMenuButtonBoundingClientRect();
+        const systemInfo = wx.getSystemInfoSync();
+
+        const isCustomNavBar = (systemInfo.screenHeight === systemInfo.windowHeight);
+
+        let top
+        if (isCustomNavBar) {
+          top = menuRect.bottom + 10
+        } else {
+          top = systemInfo.statusBarHeight + 20
+        }
+
+        const topInRpx = top * 750 / systemInfo.windowWidth
+
+        this.setData({
+          adBannerTop: topInRpx
+        })
+      } catch (err) {
+      }
+    },
+
+    compareVersion(v1, v2) {
+      const s1 = v1.split('.').map(Number);
+      const s2 = v2.split('.').map(Number);
+      const len = Math.max(s1.length, s2.length);
+
+      for (let i = 0; i < len; i++) {
+        const n1 = s1[i] || 0;
+        const n2 = s2[i] || 0;
+        if (n1 > n2) return 1;
+        if (n1 < n2) return -1;
+      }
+      return 0;
+    },
+    canUseCoverAdAPI() {
+      const REQUIRED_VERSION = '3.7.8';
+      const systemInfo = wx.getSystemInfoSync();
+      const sdkVersion = systemInfo.SDKVersion;
+      return this.compareVersion(sdkVersion, REQUIRED_VERSION) >= 0;
+    },
+
     jump() {
       this.setData({
         splashStatus: false

package/src/ad-splash/index.wxml

@@ -1,5 +1,5 @@
 <view wx:if="{{splashStatus && currentAd.splash.unitId}}" class="splash-container">
-  <view class="ad-banner-top">
+  <view class="ad-banner-top" style="top: {{adBannerTop}}rpx;">
     <text class="ad-tag">广告</text>
     <text class="ad-timer">{{countDown}} 秒</text>
     <view class="skip-btn" bindtap="jump">跳过</view>

package/src/ad-splash/index.wxss

@@ -5,7 +5,6 @@
 
 .ad-banner-top {
   position: absolute;
-  top: 160rpx;
   right: 20rpx;
   display: flex;
   align-items: center;

package/src/mixins/ad-base.js

@@ -1,55 +1,159 @@
 const {getAds} = require('../request.js')
 
 module.exports = {
-  restoreAdState() {
+  // 检查并重置每日数据
+  checkAndResetDaily() {
     const slotId = this.properties.slotId
     const type = this.properties.type
-    const adIndexKey = `adIndex_${slotId}_${type}`
-    const adShowCountKey = `adShowCount_${slotId}_${type}`
+    const dateKey = `adDate_${slotId}_${type}`
 
-    const savedIndex = wx.getStorageSync(adIndexKey) || 0
-    const savedShowCount = wx.getStorageSync(adShowCountKey) || 0
+    const today = new Date().toDateString()
+    const savedDate = wx.getStorageSync(dateKey)
 
-    this.setData({
-      currentAdIndex: savedIndex,
-      currentAdShowCount: savedShowCount
-    })
+    // 如果日期不同，重置所有数据
+    if (savedDate !== today) {
+      const customAdIndexKey = `customAdIndex_${slotId}_${type}`
+      const customAdShowCountKey = `customAdShowCount_${slotId}_${type}`
+
+      wx.setStorageSync(dateKey, today)
+      wx.setStorageSync(customAdIndexKey, 1)  // 自有广告从索引1开始
+      wx.setStorageSync(customAdShowCountKey, 0)
+
+      return true // 表示已重置
+    }
+
+    return false // 表示未重置
+  },
+
+  restoreAdState() {
+    // 检查并重置每日数据
+    this.checkAndResetDaily()
   },
 
   saveAdState() {
     const slotId = this.properties.slotId
     const type = this.properties.type
-    const adIndexKey = `adIndex_${slotId}_${type}`
-    const adShowCountKey = `adShowCount_${slotId}_${type}`
+    const customAdIndexKey = `customAdIndex_${slotId}_${type}`
+    const customAdShowCountKey = `customAdShowCount_${slotId}_${type}`
 
-    wx.setStorageSync(adIndexKey, this.data.currentAdIndex)
-    wx.setStorageSync(adShowCountKey, this.data.currentAdShowCount)
+    // 只保存自有广告的状态（索引>0）
+    if (this.data.currentAdIndex > 0) {
+      wx.setStorageSync(customAdIndexKey, this.data.currentAdIndex)
+      wx.setStorageSync(customAdShowCountKey, this.data.currentAdShowCount)
+    }
+  },
+
+  // 检查微信广告是否失败（只在内存中，不持久化）
+  isWxAdFailed() {
+    return this.data.wxAdFailed || false
+  },
+
+  // 标记微信广告失败（只在内存中，不持久化）
+  markWxAdFailed() {
+    this.setData({
+      wxAdFailed: true
+    })
+  },
+
+  // 检查所有自有广告是否都达到上限
+  isAllCustomAdsReachedLimit() {
+    const ads = this.data.ads
+    if (!ads || ads.length <= 1) return true // 只有微信广告或没有广告
+
+    const currentIndex = this.data.currentAdIndex
+    const showCount = this.data.currentAdShowCount
+
+    // 如果当前不是自有广告，返回false
+    if (currentIndex === 0) return false
+
+    // 找到最后一个有效的自有广告索引
+    let lastValidAdIndex = -1
+    for (let i = ads.length - 1; i >= 1; i--) {
+      if (ads[i][this.properties.type] !== undefined) {
+        lastValidAdIndex = i
+        break
+      }
+    }
+
+    // 如果没有有效的自有广告，返回true
+    if (lastValidAdIndex === -1) return true
+
+    // 如果当前索引已经是最后一个有效广告，且达到展示上限，返回true
+    if (currentIndex === lastValidAdIndex) {
+      const ad = ads[currentIndex]
+      const maxShowCount = ad.showCount || 1
+      return showCount >= maxShowCount
+    }
+
+    return false
   },
 
   loadNextAd() {
     const ads = this.data.ads
     if (!ads || ads.length === 0) return
 
+    // 检查并重置每日数据
+    this.checkAndResetDaily()
+
     let currentIndex = this.data.currentAdIndex
     let showCount = this.data.currentAdShowCount
 
-    const currentAd = ads[currentIndex % ads.length]
+    // 如果是微信广告（索引0）且未失败，直接加载微信广告
+    if (currentIndex === 0 && !this.isWxAdFailed()) {
+      const wxAd = ads[0]
+      if (wxAd && wxAd[this.properties.type] !== undefined) {
+        this.setData({currentAd: wxAd})
+        return
+      } else {
+        // 微信广告没有配置，标记为失败，切换到自有广告
+        this.markWxAdFailed()
+        currentIndex = 1
+        showCount = 0
+      }
+    }
+
+    // 如果微信广告失败，从自有广告开始
+    if (currentIndex === 0 && this.isWxAdFailed()) {
+      // 从存储中恢复自有广告的状态
+      const slotId = this.properties.slotId
+      const type = this.properties.type
+      const customAdIndexKey = `customAdIndex_${slotId}_${type}`
+      const customAdShowCountKey = `customAdShowCount_${slotId}_${type}`
+
+      currentIndex = wx.getStorageSync(customAdIndexKey) || 1
+      showCount = wx.getStorageSync(customAdShowCountKey) || 0
+    }
+
+    // 如果没有自有广告，不展示任何广告
+    if (ads.length <= 1) {
+      return
+    }
 
-    const maxShowCount = currentAd.showCount || 1
+    // 检查所有自有广告是否都达到上限
+    if (this.isAllCustomAdsReachedLimit()) {
+      return
+    }
+
+    // 处理自有广告的展示次数限制
+    let ad = ads[currentIndex]
+    const maxShowCount = ad.showCount || 1
+
+    // 如果当前自有广告达到展示上限，切换到下一个
     if (showCount >= maxShowCount) {
       currentIndex = currentIndex + 1
       showCount = 0
-      this.setData({
-        currentAdIndex: currentIndex,
-        currentAdShowCount: showCount
-      })
-      this.saveAdState()
-    }
 
-    const ad = ads[currentIndex % ads.length]
-    this.setData({currentAd: ad})
+      // 如果超出广告列表范围，说明所有广告都达到上限
+      if (currentIndex >= ads.length) {
+        return
+      }
+
+      ad = ads[currentIndex]
+    }
 
+    // 检查当前广告是否有配置
     if (ad[this.properties.type] === undefined) {
+      // 没有配置，跳过并尝试下一个
       this.setData({
         currentAdIndex: currentIndex + 1,
         currentAdShowCount: 0
@@ -59,8 +163,11 @@ module.exports = {
       return
     }
 
+    // 设置当前广告
     this.setData({
-      currentAdShowCount: showCount + 1
+      currentAd: ad,
+      currentAdIndex: currentIndex,
+      currentAdShowCount: showCount
     })
     this.saveAdState()
   },
@@ -86,9 +193,23 @@ module.exports = {
       this.triggerEvent('adLoad', e.detail || {})
     }
     this.report('load')
+
+    // 只有自有广告（索引>0）才增加展示计数
+    if (this.data.currentAdIndex > 0) {
+      const showCount = this.data.currentAdShowCount
+      this.setData({
+        currentAdShowCount: showCount + 1
+      })
+      this.saveAdState()
+    }
   },
 
   adError(e) {
+    // 如果是微信广告（索引0）失败，标记为失败状态
+    if (this.data.currentAdIndex === 0) {
+      this.markWxAdFailed()
+    }
+
     if (e === 'undefined') {
       this.triggerEvent('adError', {msg: 'ad adError'})
     } else {
@@ -119,7 +240,13 @@ module.exports = {
     const slotId = this.properties.slotId
     const ads = await getAds(slotId)
     this.setData({ads})
-    this.restoreAdState()
+
+    // 每次初始化时，总是从微信广告开始（索引0）
+    this.setData({
+      currentAdIndex: 0,
+      currentAdShowCount: 0
+    })
+
     this.loadNextAd()
   }
 }

package/miniprogram_dist/assets/copy.wxss

@@ -1,3 +0,0 @@
-page {
-    width: 100%;
-}

package/miniprogram_dist/utils.js

@@ -1,5 +0,0 @@
-module.exports = {
-  getFlag() {
-    return true
-  },
-}

package/src/assets/copy.wxss

@@ -1,3 +0,0 @@
-page {
-    width: 100%;
-}

package/src/common.wxss

@@ -1,5 +0,0 @@
-@import "./reset.wxss";
-
-.other {
-    font-size: 20px;
-}

package/src/index.js

@@ -1,24 +0,0 @@
-const _ = require('./utils')
-
-Component({
-  properties: {
-    prop: {
-      type: String,
-      value: 'index.properties'
-    },
-  },
-  data: {
-    flag: false,
-  },
-  lifetimes: {
-    attached() {
-      wx.getSystemInfo({
-        success: () => {
-          this.setData({
-            flag: _.getFlag(),
-          })
-        }
-      })
-    }
-  }
-})

package/src/index.json

@@ -1,9 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "other": "./other"
-  },
-  "componentGenerics": {
-    "genericsTest": true
-  }
-}

package/src/index.wxml

@@ -1,2 +0,0 @@
-<view class="index other">{{prop}}-{{flag}}</view>
-<other></other>

package/src/index.wxss

@@ -1,6 +0,0 @@
-@import "./common.wxss";
-@import "./reset.wxss";
-
-.index {
-  color: green;
-}

package/src/lib.ts

@@ -1,5 +0,0 @@
-export default {
-  printf() {
-    return 'miniprogram-custom-component api demo'
-  }
-}

package/src/reset.wxss

@@ -1,3 +0,0 @@
-.reset {
-    background: white;
-}

package/src/utils.js

@@ -1,5 +0,0 @@
-module.exports = {
-  getFlag() {
-    return true
-  },
-}