vhall-mini-sdk 0.2.0 → 0.3.0

package/lib/components/chat/chat-item/chat-item.js

@@ -104,7 +104,7 @@ Component({
     memberLevel: {
       type: Object,
       value: null,
-  },
+    },
   },
   data: {
     roleName: {
@@ -152,11 +152,11 @@ Component({
         const item = (memberLevel.custom_list || []).find((item) => item.level == level);
         icon = item?.icon || '';
       } else {
-        icon = `https://t-alistatic01.e.vhall.com/common-static/images/mp/vip/vip${level}.png`;
+        icon = `https://cnstatic01.e.vhall.com/common-static/images/mp/vip/vip${level}.png`;
       }
 
       this.setData({ memberLevelIcon: icon });
-  },
+    },
     preview(event) {
       const index = event.currentTarget.dataset.index;
       const imgList = this.data.chatItem.data.image_urls;
@@ -186,8 +186,8 @@ Component({
       // 构建正则表达式来匹配 @ 昵称和表情
       const atPattern =
         atNames.length > 0 ?
-        atNames.map((name) => this._escapeRegExp(name)).join('|') :
-        '';
+          atNames.map((name) => this._escapeRegExp(name)).join('|') :
+          '';
       const facePattern = Object.keys(faceArr)
         .map(this._escapeRegExp)
         .join('|');

package/lib/components/live-landscape/live-landscape.js

@@ -1,3 +1,5 @@
+import { reloadCurrentPage } from '../../shared/mpUtils.js';
+
 Component({
   properties: {
     sdkInstance: {
@@ -9,6 +11,7 @@ Component({
     tabList: [],
     activeTab: 0,
     liveInfo: null,
+    isReady: false, // SDK 是否已初始化完成
     showStartDialog: false, // 是否显示开始直播弹窗
 
     showRecordWatchExpireDialog: false, // 是否显示回放视频已过观看有效期提示框
@@ -31,6 +34,9 @@ Component({
             liveInfo: val,
           });
         },
+        isReady: (val) => {
+          this.setData({ isReady: !!val });
+        },
         webinarStatus: (val) => {
           this.setData({
             webinarStatus: val,
@@ -124,7 +130,7 @@ Component({
       this.setData({
         showStartDialog: false,
       });
-      this.sdkInstance.init();
+      reloadCurrentPage();
     },
     handleExprie() {
       this.sdkInstance._handleBizErrorCode(512912)

package/lib/components/live-landscape/live-landscape.json

@@ -13,6 +13,7 @@
     "vhall-product-order": "../product/product-order/product-order",
     "vhall-lottery": "../lottery/lottery",
     "vhall-mall-reward":"../mall-reward/index",
+    "vhall-announcement":"../announcement/index",
     "start-countdown": "../../pubComponents/countdown/countdown",
     "signin-dialog": "../signin/signin-dialog",
     "my-invite-detail": "../invite-rank/my-invite-detail",
@@ -31,6 +32,7 @@
     "vhall-gift-sender": "view",
     "vhall-lottery": "view",
     "vhall-mall-reward":"view",
+    "vhall-announcement":"view",
     "vhall-invite-rank": "view"
   },
   "permissiion": {

package/lib/components/live-landscape/live-landscape.wxml

@@ -1,4 +1,5 @@
-<view class="live_landscape" wx:if="{{!errorResp || !errorResp.code}}">
+<error-page wx:if="{{errorResp && errorResp.code}}" errorResp="{{errorResp}}"></error-page>
+<view class="live_landscape" wx:elif="{{isReady}}">
   <view class="live_landscape_player">
     <vhall-player sdkInstance="{{sdkInstance}}"></vhall-player>
   </view>
@@ -66,8 +67,10 @@
   <vh-popup visible="{{showOrder}}" mode="bottom" maskClosable="true" bind:close="closeOrder">
     <vhall-product-order show="{{showOrder}}" product="{{selectedProduct}}" sdkInstance="{{sdkInstance}}" bind:close="closeOrder" bind:paySuccess="onPaySuccess" />
   </vh-popup>
-  <vhall-lottery sdkInstance="{{sdkInstance}}" />
+  <!-- 抽奖组件 -->
+  <vhall-lottery wx:if="{{webinarStatus==1}}" sdkInstance="{{sdkInstance}}" />
   <!-- 商城奖励 -->
-  <vhall-mall-reward sdkInstance="{{sdkInstance}}" />
+  <vhall-mall-reward wx:if="{{webinarStatus==1||webinarStatus==5}}" sdkInstance="{{sdkInstance}}" />
+  <!-- 公告组件 -->
+  <vhall-announcement wx:if="{{webinarStatus==1||webinarStatus==5}}" sdkInstance="{{sdkInstance}}" mode="{{1}}" />
 </view>
-<error-page wx:else errorResp="{{errorResp}}"></error-page>

package/lib/components/live-portrait/live-portrait.js

@@ -1,3 +1,5 @@
+import { reloadCurrentPage } from '../../shared/mpUtils.js';
+
 Component({
   properties: {
     sdkInstance: {
@@ -9,6 +11,7 @@ Component({
     tabList: [],
     activeTab: 0,
     liveInfo: null,
+    isReady: false, // SDK 是否已初始化完成
     showStartDialog: false, // 是否显示开始直播弹窗
 
     showRecordWatchExpireDialog: false, // 是否显示回放视频已过观看有效期提示框
@@ -42,6 +45,9 @@ Component({
             liveInfo: val,
           });
         },
+        isReady: (val) => {
+          this.setData({ isReady: !!val });
+        },
         webinarStatus: (val) => {
           this.setData({
             webinarStatus: val,
@@ -148,7 +154,8 @@ Component({
       this.setData({
         showStartDialog: false,
       });
-      this.sdkInstance.init();
+      reloadCurrentPage();
+
     },
     handleExprie() {
       this.sdkInstance._handleBizErrorCode(512912)
@@ -279,4 +286,5 @@ Component({
       // 支付成功后的处理
     },
   },
-});
+});
+

package/lib/components/live-portrait/live-portrait.json

@@ -13,6 +13,7 @@
     "vhall-product-order": "../product/product-order/product-order",
     "vhall-lottery": "../lottery/lottery",
     "vhall-mall-reward": "../mall-reward/index",
+    "vhall-announcement": "../announcement/index",
     "product-detail": "../product/product-detail/product-detail",
     "start-countdown": "../../pubComponents/countdown/countdown",
     "signin-dialog": "../signin/signin-dialog",
@@ -33,6 +34,7 @@
     "signin-dialog": "view",
     "vhall-gift-sender": "view",
     "vhall-lottery": "view",
-    "vhall-invite-rank": "view"
+    "vhall-invite-rank": "view",
+    "vhall-announcement": "view"
   }
 }

package/lib/components/live-portrait/live-portrait.wxml

@@ -1,4 +1,5 @@
-<view class="live_portrait" wx:if="{{!errorResp || !errorResp.code}}">
+<error-page wx:if="{{errorResp && errorResp.code}}" errorResp="{{errorResp}}"></error-page>
+<view class="live_portrait" wx:elif="{{isReady}}">
   <view class="live_portrait_player">
     <vhall-player sdkInstance="{{sdkInstance}}" objectFit="{{playerObjectFit}}"></vhall-player>
   </view>
@@ -99,8 +100,11 @@
       </scroll-view>
     </view>
   </vh-popup>
-  <vhall-lottery sdkInstance="{{sdkInstance}}" />
+  <!-- 抽奖组件 -->
+  <vhall-lottery wx:if="{{webinarStatus==1}}" sdkInstance="{{sdkInstance}}" />
   <!-- 商城奖励 -->
-  <vhall-mall-reward sdkInstance="{{sdkInstance}}" />
+  <vhall-mall-reward wx:if="{{webinarStatus==1||webinarStatus==5}}" sdkInstance="{{sdkInstance}}" />
+  <!-- 公告组件 -->
+  <vhall-announcement wx:if="{{webinarStatus==1||webinarStatus==5}}" sdkInstance="{{sdkInstance}}" mode="{{0}}" />
 </view>
-<error-page wx:else errorResp="{{errorResp}}"></error-page>
+

package/lib/components/mall-reward/index.js

@@ -35,12 +35,11 @@ Component({
       if (!_sdkInstance) return;
       log.info('mall-reward sdkInstance');
       this.sdkInstance = _sdkInstance;
-      this.setData({
-        initTime: Date.now(),
-      });
       this.initEventListener();
-
-      this.checkAndFetchMallRewardInfo('refresh');
+      if (this.sdkInstance.isReady()) {
+        // 已经 ready 了，立刻刷新（事件已发过，不等）
+        this.onSdkReady();
+      }
     },
   },
   lifetimes: {
@@ -58,6 +57,11 @@ Component({
       this.unlistener?.();
       const obj = {};
 
+      // 直接调用 sdkInstance.init()触发
+      obj[this.sdkInstance.EVENT.SDK_READY] = () => {
+        this.onSdkReady();
+      };
+
       // 推送商城奖励
       obj[this.sdkInstance.EVENT.MALL_REWARD_PUSH] = (msg) => {
         log.info('mallReward open msg:', JSON.stringify(msg));
@@ -66,6 +70,7 @@ Component({
         if (!this.webinarType != 1) {
           return;
         }
+        this.sdkInstance.BRSAgent?.customLog('checkAndFetchMallRewardInfo from=push');
         this.checkAndFetchMallRewardInfo('push', { reward_id: msg.data?.id });
         // 消息推送
         // const data = {
@@ -109,41 +114,54 @@ Component({
         });
       };
 
-      // 上线消息
-      obj[this.sdkInstance.EVENT.JOIN_MSG] = (msg) => {
-        log.info('mallReward ------handleMsgJoin-msg：', msg);
-        // 监听上线消息，刷新商城奖励数据条件：
-        //（1）上线的人是自己；（ 支持多端上线）
-        //（2）间隔初始化请求时间超过3s(否则每次刷新调用两次请求；是否可以仅使用JOIN消息请求？不行，因为join消息不可靠，有时候收不到)
+      // 连接状态变化（以 socket connected/disconnect 为准，比 JOIN_MSG 广播更可靠）
+      obj[this.sdkInstance.EVENT.ONLINE_STATE_CHANGE] = (data) => {
+        log.info('mallReward ------handleOnlineStateChange data：', data);
         if (!this.sdkInstance) return;
-        const watchInitData = this.sdkInstance.store.get('watchInitData');
-        const thirdPartyUserId = watchInitData?.join_info?.third_party_user_id;
-        /* prettier-ignore */
-        if (thirdPartyUserId && msg.sender_id == thirdPartyUserId && Date.now() - this.data.initTime > 3000) {
-          this.checkAndFetchMallRewardInfo('refresh');
+        if (data?.online) {
+          // 上线（连接建立成功）：刷新商城奖励数据（与 FOREGROUND_REFRESH 共用防抖，避免重复请求）
+          if (this._shouldRefreshByEvent()) {
+            this.sdkInstance.BRSAgent?.customLog('checkAndFetchMallRewardInfo from=refresh, online_state_change');
+            this.checkAndFetchMallRewardInfo('refresh');
+          }
+        } else {
+          // 下线（连接断开）：暂停计时器
+          log.info('mallReward ------onlineStateChange offline, 倒计时暂停');
+          this.destroyTimer();
         }
       };
 
-      // 下线消息
-      obj[this.sdkInstance.EVENT.LEAVE_MSG] = (msg) => {
-        log.info('mallReward ------handleMsgLeave-msg：', msg);
+      // 切回前台刷新（JOIN_MSG 有限频不可靠，以此事件兜底刷新商城奖励数据）
+      obj[this.sdkInstance.EVENT.FOREGROUND_REFRESH] = (data) => {
+        log.info('mallReward ------handleForegroundRefresh data：', data);
         if (!this.sdkInstance) return;
-        const watchInitData = this.sdkInstance.store.get('watchInitData');
-        const localKickMark = this.sdkInstance.store.get('kickMark');
-        const localKickID = watchInitData?.sso?.kick_id;
-        const msgContex = safeJsonParse(msg?.context);
-        /* prettier-ignore */ // 自己下线了，计时器暂停
-        if (localKickMark && localKickID && msgContex.kick_id === localKickID && msgContex.kick_mark === localKickMark) {
-          console.log('mallReward 倒计时暂停');
-          this.destroyTimer();
+        this.sdkInstance.BRSAgent?.customLog('checkAndFetchMallRewardInfo from=refresh, foreground_refresh');
+        if (this._shouldRefreshByEvent()) {
+          this.checkAndFetchMallRewardInfo('refresh');
         }
       };
 
       this.unlistener = this.sdkInstance.on(obj);
     },
+    onSdkReady() {
+      log.info('mall-reward onSdkReady');
+      this.setData({ initTime: Date.now() });
+      this.sdkInstance.BRSAgent?.customLog('checkAndFetchMallRewardInfo from=refresh, onSdkReady');
+      this.checkAndFetchMallRewardInfo('refresh');
+    },
+    // 事件触发的刷新防抖：JOIN_MSG / FOREGROUND_REFRESH 等共用冷却，避免接口重复触发
+    _shouldRefreshByEvent() {
+      const now = Date.now();
+      // 距离上次事件刷新（或 onSdkReady 初始化刷新）不足 3s 时跳过，避免接口重复请求
+      const last = this._lastRefreshTime || this.data.initTime || 0;
+      if (last && now - last < 2000) {
+        return false;
+      }
+      this._lastRefreshTime = now;
+      return true;
+    },
     async checkAndFetchMallRewardInfo(from, extra) {
-      this.sdkInstance.BRSAgent?.customLog(`checkAndFetchMallRewardInfo from=${from}`, JSON.stringify(extra));
-      log.info('mall-reward checkAndFetchMallRewardInfo start');
+      log.info('mall-reward checkAndFetchMallRewardInfo call')
       const mallRewardServer = this.sdkInstance.get('mallRewardServer');
       if (!mallRewardServer) return;
 

package/lib/components/product/product-card/product-card.js

@@ -6,7 +6,7 @@ Component({
     sdkInstance: {
       type: Object,
       value: null,
-      observer: function(newVal) {
+      observer: function (newVal) {
         if (newVal) {
           this.initStoreListener();
           // 初始加载商品数据
@@ -38,7 +38,7 @@ Component({
       if (this.unsub) {
         this.unsub();
       }
-      
+
       this.unsub = this.properties.sdkInstance.store.get({
         productList: (val) => {
           if (val) {
@@ -46,7 +46,6 @@ Component({
             const filteredProducts = val.filter(product => product.push_status === 1);
             // 最多显示3个商品卡片
             const products = filteredProducts.slice(0, 3);
-            this.properties.sdkInstance.get('logReportServer').report('116999', { stage: 'productCardUpdate', logData: products });
             this.setData({
               products: products
             });
@@ -70,12 +69,12 @@ Component({
         console.error('商品数据不存在');
         return;
       }
-      
+
       // 检查是否已抢光或待开价
       if (product.sale_status === 0 || product.covered_status === 1) {
         return;
       }
-      
+
       // 检查 buy_type
       if (product.buy_type === 4 && product?.mini_program_config?.mini_program_path) {
         // 跳转到小程序路径
@@ -99,7 +98,7 @@ Component({
     // 点击关闭按钮（通过改变本地数据关闭卡片）
     onCloseCard(e) {
       const productId = e.currentTarget.dataset.productId;
-      
+
       // 从本地数据中移除该商品
       const updatedProducts = this.data.products.filter(product => product.goods_id !== productId);
       this.setData({

package/lib/components/product/product-detail/product-detail.js

@@ -15,7 +15,7 @@ Component({
     sdkInstance: {
       type: Object,
       value: null,
-      observer: function(newVal) {
+      observer: function (newVal) {
         if (newVal) {
           this.initStoreListener();
         }
@@ -42,7 +42,7 @@ Component({
   },
   observers: {
     // 监听显示状态变化
-    show: function(show) {
+    show: function (show) {
       if (show) {
         // 重置数据
         this.setData({
@@ -57,7 +57,7 @@ Component({
       if (this.unsub) {
         this.unsub();
       }
-      
+
       this.unsub = this.properties.sdkInstance.store.get({
         productList: (val) => {
           if (val && this.properties.product && this.properties.product.goods_id) {
@@ -83,17 +83,17 @@ Component({
     // 购买商品
     buyProduct() {
       const product = this.data.product;
-      
+
       if (!product) {
         console.error('商品数据不存在');
         return;
       }
-      
+
       // 检查是否已抢光或待开价
       if (product.sale_status === 0 || product.covered_status === 1) {
         return;
       }
-      
+
       // 检查 buy_type
       if (product.buy_type === 4 && product?.mini_program_config?.mini_program_path) {
         // 跳转到小程序路径

package/lib/components/product/product-list/product-list.js

@@ -3,7 +3,7 @@ Component({
     sdkInstance: {
       type: Object,
       value: null,
-      observer: function(newVal) {
+      observer: function (newVal) {
         if (newVal) {
           this.initStoreListener();
         }
@@ -46,11 +46,10 @@ Component({
       if (this.unsub) {
         this.unsub();
       }
-      
+
       this.unsub = this.properties.sdkInstance.store.get({
         productList: (val) => {
           if (val) {
-            this.properties.sdkInstance.get('logReportServer').report('116999', { stage: 'productListUpdate', logData: val });
             this.setData({ productList: val });
           }
         }