vhall-mini-sdk 0.2.1 → 0.3.1

package/CHANGELOG.md

@@ -0,0 +1,44 @@
+# Changelog
+
+本项目所有重要变更均记录于此文件。
+
+格式遵循 [Keep a Changelog](https://keepachangelog.com/)，版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
+
+## [0.3.1] - 2026-08-13
+
+### 修复
+
+- 修复公告关闭事件定义重复问题。
+
+## [0.3.0] - 2026-08-13
+
+### 新增
+
+- 直播和回放场景下新增 <span style="color:red">公告</span> 能力。
+
+- VhallMiniSdk增加 <span style="color:red">VERSION</span> 属性，实例增加 <span style="color:red">version</span> 属性， 方便获取当前SDK版本号。
+
+### 变更
+
+- SDK 错误页支持直播模式（mode，0：竖屏，1：横屏）初始0或1，不用空值，业务侧无需额外调用 setData 即可正常展示。
+
+### 修复
+
+- 修复某些场景下商城奖励计时不动以及计时不准确的问题。
+
+## [0.2.1] - 2026-08-06
+
+### 变更
+
+- SDK和几个插件都去掉了具名导出，避免默认导出和具名导出混用带来的问题。
+
+```js
+// 旧
+import { MallRewardServer } from ...
+// 新
+import MallRewardServer from ...
+```
+
+### 修复
+
+- 修复某些场景下收不到消息的问题。

package/lib/components/announcement/announ-banner/index.js

@@ -0,0 +1,40 @@
+Component({
+  properties: {
+    text: {
+      type: String,
+      value: '',
+    },
+    show: {
+      type: Boolean,
+      value: false,
+    },
+    static: {
+      type: Boolean,
+      value: false,
+    },
+    // 直播间模式：0=竖屏，1=横屏（样式区分）
+    mode: {
+      type: Number,
+      value: 0,
+    },
+  },
+
+  data: {
+    duration: 6, // 滚动动画时长（秒），按文字长度动态计算
+  },
+
+  observers: {
+    // 文字越长滚动时长越大，保持匀速观感
+    text(val) {
+      const len = (val || '').length;
+      const duration = Math.max(4, Math.ceil(len * 0.2));
+      this.setData({ duration });
+    },
+  },
+
+  methods: {
+    onClose() {
+      this.triggerEvent('close');
+    },
+  },
+});

package/lib/components/announcement/announ-banner/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "styleIsolation": "shared"
+}

package/lib/components/announcement/announ-banner/index.wxml

@@ -0,0 +1,13 @@
+<view wx:if="{{show }}" class="announ-banner {{static ? 'announ-banner--static' : ''}} mode-{{mode}}">
+  <view class="announ-banner-icon">
+    <view class="announ-banner-icon__box"></view>
+    <view class="announ-banner-icon__body"></view>
+    <view class="announ-banner-icon__wave announ-banner-icon__wave--top"></view>
+    <view class="announ-banner-icon__wave announ-banner-icon__wave--mid"></view>
+    <view class="announ-banner-icon__wave announ-banner-icon__wave--bottom"></view>
+  </view>
+  <view class="announ-banner-text-wrap">
+    <view class="announ-banner-text" style="animation-duration:{{duration}}s">{{text}}</view>
+  </view>
+  <view class="announ-banner-close" catchtap="onClose">&#10005;</view>
+</view>

package/lib/components/announcement/announ-banner/index.wxss

@@ -0,0 +1 @@
+.announ-banner{align-items:center;background:rgba(0,0,0,.5);border-radius:40rpx;box-sizing:border-box;color:#fff;display:flex;font-size:24rpx;left:12rpx;padding:0 12rpx;position:fixed;right:12rpx;top:180rpx;z-index:99}.announ-banner-icon{color:#fff;flex-shrink:0;height:32rpx;margin-right:16rpx;position:relative;width:34rpx}.mode-1 .announ-banner-icon{color:#fb3a32}.announ-banner-icon__box{background:currentColor;border-bottom-left-radius:4rpx;border-top-left-radius:4rpx;height:14rpx;left:3rpx;position:absolute;top:9rpx;width:7rpx;z-index:2}.announ-banner-icon__body{background:currentColor;border-radius:4rpx 6rpx 6rpx 4rpx;-webkit-clip-path:polygon(0 20%,0 80%,78% 100%,78% 0);clip-path:polygon(0 20%,0 80%,78% 100%,78% 0);height:28rpx;left:8rpx;position:absolute;top:2rpx;width:15rpx}.announ-banner-icon__wave{background:currentColor;border-radius:4rpx;position:absolute}.announ-banner-icon__wave--top{height:4rpx;right:4rpx;top:5rpx;transform:rotate(-32deg);width:9rpx}.announ-banner-icon__wave--mid{height:4rpx;right:1rpx;top:14rpx;width:11rpx}.announ-banner-icon__wave--bottom{bottom:5rpx;height:4rpx;right:4rpx;transform:rotate(32deg);width:9rpx}.announ-banner-text-wrap{align-items:center;display:flex;flex:1;height:100%;overflow:hidden;padding:6rpx 0}.announ-banner-text{animation:announ-banner-scroll linear infinite;display:inline-block;padding-left:100%;white-space:nowrap}.announ-banner--static .announ-banner-text{animation:none;padding-left:0}.announ-banner-close{flex-shrink:0;font-size:32rpx;margin-left:16rpx}.announ-banner.mode-1{background:linear-gradient(59.32deg,#ffebe9,#edecff 107.06%);border-radius:0;color:#262626;font-size:28rpx;left:0;max-width:none;padding:16rpx 12rpx;right:0;top:calc(56.25vw + 85rpx);transform:none;width:100%}@keyframes announ-banner-scroll{0%{transform:translateX(0)}to{transform:translateX(-100%)}}

package/lib/components/announcement/announ-icon/index.js

@@ -0,0 +1,69 @@
+Component({
+  properties: {
+    // 是否显示公告图标
+    showIcon: {
+      type: Boolean,
+      value: false,
+    },
+    // 未读角标数字
+    badge: {
+      type: Number,
+      value: 0,
+    },
+    // 直播间模式：0=竖屏，1=横屏（样式区分）
+    mode: {
+      type: Number,
+      value: 0,
+    },
+  },
+  data: {
+    x: 20,
+    y: 40,
+    startX: 0,
+    startY: 0,
+    hasMoved: false,
+  },
+  lifetimes: {
+    attached() {
+      // 初始定位：竖屏在左上角；横屏 70rpx≈35px，在右下角抽奖历史图标上方
+      try {
+        const info = wx.getSystemInfoSync();
+        const iconSize = this.data.mode === 1 ? 35 : 42;
+        if (this.data.mode === 1) {
+          // 横屏：距右 40rpx≈20px；历史图标 bottom:200rpx + 高 70rpx + 间隔 36rpx ≈ 306rpx
+          const rightGap = 20;
+          const bottomGap = 160;
+          const x = Math.max(0, info.windowWidth - iconSize - rightGap);
+          const y = Math.max(0, info.windowHeight - iconSize - bottomGap);
+          this.setData({ x, y });
+        } else {
+          // 竖屏：左上角，留 12rpx≈6px 边距
+          const x = 6;
+          const y = 40;
+          this.setData({ x, y });
+        }
+      } catch (e) {
+        // 获取失败则保持默认左上角
+      }
+    },
+  },
+  methods: {
+    onTouchStart(e) {
+      this.setData({ hasMoved: false });
+    },
+
+    onTouchEnd(e) {
+      this.data.hasMoved = false;
+    },
+
+    onDragChange(e) {
+      const { x, y } = e.detail;
+      this.setData({ x, y, hasMoved: true });
+    },
+
+    onTapIcon() {
+      if (this.data.hasMoved) return;
+      this.triggerEvent('onTapIcon');
+    },
+  },
+});

package/lib/components/announcement/announ-icon/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

package/lib/components/announcement/announ-icon/index.wxml

@@ -0,0 +1,10 @@
+<movable-area class="drag-area">
+  <movable-view wx:if="{{showIcon}}" class="drag-view" direction="all" x="{{x}}" y="{{y}}" damping="{{40}}" out-of-bounds="{{false}}" bindchange="onDragChange" bindtouchstart="onTouchStart" bindtouchend="onTouchEnd">
+    <view class="announ-icon mode-{{mode}}" bindtap="onTapIcon">
+      <image wx:if="{{mode === 1}}" class="announ-icon-img" src="https://t-alistatic01.e.vhall.com/common-static/saas-wap/static/img/notice-icon.a86f1993.png" mode="aspectFit" />
+      <image wx:else class="announ-icon-img" src="https://t-alistatic01.e.vhall.com/common-static/images/mp/announ_icon.png" mode="aspectFit" />
+      <text wx:if="{{mode !== 1}}" class="announ-icon-text">公告</text>
+      <view wx:if="{{badge > 0}}" class="announ-icon-badge">{{badge > 99 ? '99+' : badge}}</view>
+    </view>
+  </movable-view>
+</movable-area>

package/lib/components/announcement/announ-icon/index.wxss

@@ -0,0 +1 @@
+.drag-area{height:100vh;left:0;pointer-events:none;position:fixed;top:0;width:100vw;z-index:100}.drag-view{height:96rpx;pointer-events:auto;top:10rpx;width:96rpx}.announ-icon{align-items:center;background:rgba(0,0,0,.4);border-radius:50%;display:flex;flex-direction:column;height:84rpx;justify-content:center;position:relative;width:84rpx}.announ-icon.mode-1{height:70rpx;width:70rpx}.announ-icon-img{height:64rpx;width:64rpx}.mode-1 .announ-icon-img{height:70rpx;width:70rpx}.announ-icon-text{color:#fff;font-size:24rpx;margin-top:-20rpx}.announ-icon-badge{align-items:center;background:#ff3b30;border:2rpx solid #fff;border-radius:16rpx;box-sizing:border-box;color:#fff;display:flex;font-size:20rpx;font-weight:700;height:32rpx;justify-content:center;min-width:32rpx;padding:0 8rpx;position:absolute;right:-8rpx;top:-8rpx}

package/lib/components/announcement/announ-popup/index.js

@@ -0,0 +1,44 @@
+Component({
+  properties: {
+    show: { type: Boolean, value: false },
+    // 公告信息（store.announcement）
+    info: { type: Object, value: null },
+  },
+
+  data: {
+    list: [],
+  },
+
+  observers: {
+    info: function (info) {
+      const rawList = info?.list || [];
+      this.setData({
+        list: rawList.map((item) => ({
+          ...item,
+          _text: this.getContentText(item.content),
+          _time: this.formatTime(item.created_at),
+        })),
+      });
+    },
+  },
+
+  methods: {
+    getContentText(content) {
+      if (!content) return '';
+      if (typeof content === 'string') return content;
+      return content.content || content.text || '';
+    },
+
+    formatTime(time) {
+      if (!time) return '';
+      if (typeof time !== 'string') return '';
+      // 将 "2026-08-07 16:47:13" 截断为 "08-07 16:47"
+      const matched = time.match(/\d{4}-(\d{2}-\d{2})\s+(\d{2}:\d{2}):\d{2}/);
+      return matched ? `${matched[1]} ${matched[2]}` : time;
+    },
+
+    onClose() {
+      this.triggerEvent('close');
+    },
+  },
+});

package/lib/components/announcement/announ-popup/index.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "styleIsolation": "shared",
+  "usingComponents": {
+    "vh-popup": "../../../pubComponents/popup/popup"
+  }
+}

package/lib/components/announcement/announ-popup/index.wxml

@@ -0,0 +1,39 @@
+<vh-popup
+  wx:if="{{show}}"
+  visible="{{show}}"
+  showClose="{{true}}"
+  mode="bottom"
+  hasMask="{{true}}"
+  maskClosable="{{true}}"
+  bgColor="#f7f7f7"
+  bind:close="onClose"
+>
+  <view class="announ-popup">
+    <view class="announ-popup-header">
+      <text class="announ-popup-star left">✦</text>
+      <text class="announ-popup-title">公告</text>
+      <text class="announ-popup-star right">✦</text>
+    </view>
+    <scroll-view class="announ-popup-list" scroll-y>
+      <view class="announ-items">
+        <view
+          wx:for="{{list}}"
+          wx:key="id"
+          class="announ-item {{index === list.length - 1 ? 'last' : ''}} {{index === 0 ? 'first' : ''}}"
+        >
+          <view class="announ-item-timeline">
+            <view class="announ-item-line announ-item-line-top"></view>
+            <view class="announ-item-dot-outer">
+              <view class="announ-item-dot-inner"></view>
+            </view>
+            <view class="announ-item-line announ-item-line-bottom"></view>
+          </view>
+          <view class="announ-item-content">
+            <view class="announ-item-text">{{item._text}}</view>
+            <view class="announ-item-time">{{item._time}}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</vh-popup>

package/lib/components/announcement/announ-popup/index.wxss

@@ -0,0 +1 @@
+.popup-body{display:flex}.announ-popup{background:#f7f7f7;box-sizing:border-box;display:flex;flex-direction:column;height:50vh;width:100%}.announ-popup-header{align-items:center;display:flex;justify-content:center;margin-bottom:32rpx;position:relative}.announ-popup-title{color:#1a1a1a;font-size:36rpx;font-weight:600;position:relative}.announ-popup-title:after{background:#ff4d4f;border-radius:4rpx;bottom:-4rpx;content:"";height:8rpx;left:50%;opacity:.6;position:absolute;transform:translateX(-50%);width:60%}.announ-popup-star{color:#ffcd00;font-size:24rpx;margin:0 12rpx}.announ-popup-star.left{transform:rotate(-15deg)}.announ-popup-star.right{transform:rotate(15deg)}.announ-popup-list{box-sizing:border-box;flex:1;min-height:0;overflow:hidden}.announ-popup-items{position:relative}.announ-popup-line{border-left:1rpx dashed #bfbfbf;left:50%;position:absolute;transform:translateX(-50%);width:0}.announ-item{display:flex;padding-bottom:32rpx;padding-left:48rpx;position:relative}.announ-item-timeline{border-left:1rpx dashed #bfbfbf;bottom:0;left:16rpx;position:absolute;top:0;width:24rpx}.announ-item-dot-outer{align-items:center;background:#fff;border:3rpx solid #ccc;border-radius:50%;box-sizing:border-box;display:flex;flex-shrink:0;height:28rpx;justify-content:center;left:-14rpx;position:absolute;top:0;width:28rpx;z-index:1}.announ-item-dot-inner{background:#ccc;border-radius:50%;box-sizing:border-box;height:12rpx;width:12rpx}.announ-item.first .announ-item-dot-outer{background:#fff;border-color:#fb2626}.announ-item.first .announ-item-dot-inner{background:#fb2626}.announ-item.last{padding-bottom:0}.announ-item.last .announ-item-timeline{border:none}.announ-item-content{background:#fff;border-radius:12rpx;flex:1;padding:20rpx 24rpx}.announ-item-text{color:#1a1a1a;font-size:28rpx;line-height:1.5;margin-bottom:12rpx;word-break:break-all}.announ-item-time{color:#999;font-size:24rpx}

package/lib/components/announcement/index.js

@@ -0,0 +1,223 @@
+Component({
+  properties: {
+    sdkInstance: {
+      type: Object,
+      value: null,
+    },
+    // 直播间模式：0=竖屏，1=横屏（样式区分）
+    mode: {
+      type: Number,
+      value: 0,
+    },
+  },
+
+  data: {
+    announInfo: null, // 公告信息
+    showIcon: false, // 是否显示公告小图标
+    showPopup: false, // 是否显示公告弹窗
+    showBanner: false, // 是否显示公告banner
+    bannerText: '', // 公告banner文本
+    isStatic: false, // 公告banner内容是否静止不滚动（display_type==1）
+    curNoticeId: '', // 当前展示的公告 id
+    badge: 0, // 公告未读角标数字（收到推送 +1，打开弹窗清零）
+  },
+
+  observers: {
+    sdkInstance: function sdkInstance(_sdkInstance) {
+      if (!_sdkInstance) return;
+      this.sdkInstance = _sdkInstance;
+
+      this.unsub = this.sdkInstance.store.get({
+        announcement: (val) => {
+          // 初始化 / 配置刷新时，按公告数据统一处理展示逻辑
+          const watchInitData = this.sdkInstance.store.get('watchInitData');
+          const webinarType = watchInitData?.webinar?.type;
+          // 不是直播也不是回放，不处理
+          if (webinarType != 1 && webinarType != 5) return;
+
+          this.applyAnnouncement(val);
+        },
+      });
+
+      this.initEventListener();
+    },
+  },
+
+  lifetimes: {
+    detached() {
+      this.unsub && this.unsub();
+      this.unlistener?.();
+      this.clearTimer();
+    },
+  },
+
+  methods: {
+    initEventListener() {
+      this.unlistener?.();
+      const EVENT = this.sdkInstance.EVENT;
+      const obj = {};
+      // 推送公告：把消息字段转成与接口列表一致的格式，插入到列表首位（去重同 id），保留已有公告
+      obj[EVENT.ROOM_ANNOUNCEMENT] = (msg) => {
+        const data = msg?.data || msg;
+        if (!data) return;
+        // display_type: 0
+        // duration: 600
+        // event_type: "room_announcement"
+        // id: "364"
+        // push_time: "2026-08-10 16:39:55"
+        // record_display: 1
+        // room_announcement_text: "zxcfzxcxzc"
+        // room_id: "lss_1d63a879"
+        // room_join_id: "101643"
+        // set_type: 1
+        // type: "room_announcement"
+
+        const item = {
+          id: data.id,
+          content: data.room_announcement_text ? { content: data.room_announcement_text } : data.content || '',
+          duration: data.duration,
+          display_type: data.display_type,
+          create_at: data.push_time,
+          record_display: data.record_display,
+          set_type: data.set_type
+        };
+        const prev = this.sdkInstance.store.get('announcement') || {};
+        const list = (prev.list || []).filter((it) => it.id !== item.id);
+        list.unshift(item);
+
+        this.sdkInstance.store.set('announcement', { list, total: list.length });
+        // 收到推送公告，未读角标 +1
+        this.setData({ badge: this.data.badge + 1 });
+      };
+
+      // 公告删除：从列表中移除该公告，store 变化会自动触发 applyAnnouncement 重新渲染并关闭 banner
+      obj[EVENT.DEL_ROOM_ANNOUNCEMENT] = (msg) => {
+        const delId = msg?.data?.id ?? msg?.id;
+        if (!delId) return;
+        const prev = this.sdkInstance.store.get('announcement') || {};
+        const list = (prev.list || []).filter((it) => it.id !== delId);
+        this.sdkInstance.store.set('announcement', { list, total: list.length });
+      };
+
+      // 直播结束：自动关闭公告
+      obj[EVENT.LIVE_END] = () => {
+        this.closeAnnouncement();
+      };
+
+      this.unlistener = this.sdkInstance.on(obj);
+    },
+
+    /**
+     * 根据公告数据统一处理展示逻辑（store / common-config 回调）
+     * - 列表为空：关闭 banner
+     * - 否则取第一条公告 item 交给统一调度
+     */
+    applyAnnouncement(announ) {
+      this.setData({ announInfo: announ });
+
+      const list = announ?.list || [];
+      const total = announ?.total || 0;
+
+      if (total < 1) {
+        this.clearTimer();
+        this.setData({
+          showIcon: false,
+          showBanner: false,
+          isStatic: false,
+          curNoticeId: '',
+          bannerText: '',
+        });
+        return;
+      }
+
+      // 取第一条公告 item 交给统一调度
+      this.scheduleBanner(list[0] || {});
+    },
+
+    /**
+     * 统一调度 banner 展示与定时关闭
+     * - content: {content: "sdfdsfsdfsdfdsfdsfdsf"}
+     * - created_at: "2026-08-10 16:22:52" // 公告创建四时间
+     * - display_type：0 //  0 滚动， 1：不滚动
+     * - duration: 300 剩余时长，0：永久展示 ; >0 按剩余时长展示，超时自动关闭
+     * - id: "363" //公告id
+     * - set_type: 1
+     */
+    scheduleBanner(item = {}) {
+      const id = item.id;
+      const duration = Number(item.duration) || 0;
+      const displayType = Number(item.display_type);
+      const createAt = item.created_at;
+      const text = typeof item.content === 'string' ? item.content : item.content?.content || item.content?.text || '';
+
+      this.clearTimer();
+
+      this.setData({
+        showIcon: true,
+        isStatic: displayType === 1,
+        curNoticeId: id,
+        bannerText: text,
+      });
+
+      // duration < 1：永久展示
+      if (duration < 1) {
+        this.setData({ showBanner: true });
+        return;
+      }
+
+      // 计算剩余展示时长
+      const now = Date.now();
+      const createTs = this.parseTime(createAt);
+      // pushTime 解析失败则视为从当前时刻开始计时，避免 NaN 导致不展示
+      const remain = isNaN(createTs) ? duration * 1000 : duration * 1000 - (now - createTs);
+
+      if (remain > 0) {
+        this.setData({ showBanner: true });
+        this.announTimer = setTimeout(() => {
+          this.setData({ showBanner: false });
+          this.announTimer = null;
+        }, remain);
+      } else {
+        this.setData({ showBanner: false });
+      }
+    },
+
+    // 解析时间字符串为时间戳（兼容 iOS：将 "2026-08-07 16:47:13" 转为 "2026/08/07 16:47:13"）
+    parseTime(str) {
+      if (!str) return NaN;
+      const s = String(str).replace(/-/g, '/');
+      const t = new Date(s).getTime();
+      return isNaN(t) ? NaN : t;
+    },
+
+    // 清除展示定时器
+    clearTimer() {
+      if (this.announTimer) {
+        clearTimeout(this.announTimer);
+        this.announTimer = null;
+      }
+    },
+
+    // 被动关闭（删除/直播结束）：关闭当前 banner
+    closeAnnouncement() {
+      this.clearTimer();
+      this.setData({ showBanner: false });
+    },
+
+    // 用户手动关闭当前 banner
+    handleBannerClose() {
+      this.clearTimer();
+      this.setData({ showBanner: false });
+    },
+
+    // 点击公告图标：打开弹窗并清零未读角标
+    handleIconClick() {
+      this.setData({ showPopup: true, badge: 0 });
+    },
+
+    // 关闭公告弹窗
+    handlePopupClose() {
+      this.setData({ showPopup: false });
+    },
+  },
+});

package/lib/components/announcement/index.json

@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "styleIsolation": "shared",
+  "usingComponents": {
+    "announ-icon": "./announ-icon/index",
+    "announ-popup": "./announ-popup/index",
+    "announ-banner": "./announ-banner/index"
+  }
+}

package/lib/components/announcement/index.wxml

@@ -0,0 +1,6 @@
+<!-- 公告顶部滚动条 -->
+<announ-banner show="{{showBanner}}" text="{{bannerText}}" static="{{isStatic}}" mode="{{mode}}" bind:close="handleBannerClose" />
+<!-- 公告浮动小图标 -->
+<announ-icon wx:if="{{showIcon}}" showIcon="{{showIcon}}" badge="{{badge}}" mode="{{mode}}" bind:onTapIcon="handleIconClick" />
+<!-- 公告弹窗 -->
+<announ-popup show="{{showPopup}}" info="{{announInfo}}" bind:close="handlePopupClose" />

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"
   }
 }