zby-live-sdk 1.0.49-beta1018-1 → 1.0.49-beta1130-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta1018-1",
+  "version": "1.0.49-beta1130-1",
   "main": "dist/zby-live-sdk.cjs.js",
   "module": "dist/zby-live-sdk.esm.js",
   "browsers": "dist/zby-live-sdk.umd.js",

package/src/config/config.js

@@ -13,7 +13,7 @@ const urls = {
 };
 
 // export const version = require('../../package.json').version;
-export const version = '1.0.49-beta1018-1';
+export const version = '1.0.49-beta1130-1';
 
 export const liveExt = {
   name: 'live',

package/src/zby-av-sdk/zby-av-sdk.js

@@ -1782,6 +1782,21 @@ export const startAudioExCapture = () => {
   }
 };
 
+/**
+  * @function 设置授课嘉宾头像流id
+  * @return: Promise
+  */
+export const setCustomHeadStreamId = (headStreamID) => {
+  switch (window.zbyAVSDK_init_sdk_type) {
+    case RTC:
+      break;
+    case ZEGO:
+      return zegosdk.setCustomHeadStreamId(headStreamID);
+    default:
+      break;
+    }
+}
+
 /**
   * @function 开启音频外部采集
   * @return: Promise
@@ -1919,6 +1934,7 @@ export default {
   startSoundLevelMonitor,
   sendMediaSideInfo,
   enableHighlight,
+  setCustomHeadStreamId,
   setAUXAudioType,
   mixedstuVideo,
   setThirdAudioCallbackType,

package/src/zby-av-sdk/zego-sdk.js

@@ -56,6 +56,8 @@ let hasNetWrong = false;
 const classType = 0;
 // 监听id
 let EMListenerId = 0;
+// 缓存上层传入的AppId
+let cacheAppId = 0;
 
 //静音推流时，音量值是否上抛上层标志 false=没有声音不往上层通知/true=有声音有上层通知
 let isNoticeMicVolumeZego = false;
@@ -604,6 +606,7 @@ export const startEngine = (appId, appSignature, businessType) => {
   if (typeof businessType === 'undefined') {
     businessType = 0;
   }
+  cacheAppId = appId;
   defaultApi.writeLog('avsdk ZEGO::StartEngine');
   return callMethod('StartEngine', {
     appId,
@@ -2088,13 +2091,14 @@ export const mixStream = (type, args, seq) => {
  * @param extraStreamIds:Array 非（课件+老师头像流）流ID [{contentControl:2,streamId:'stream_1',left:10,top:10,right:170,bottom:100},{contentControl:0,streamId:'stream_2',left:10,top:110,right:170,bottom:200}]
  * @param targetRtcStreamId:String 混流输出流ID，必选
  * @param targetUrls:Array 转推RTMP流地址，必选
- * @param backgroundImageId:Int 0默认，1上台，2关闭摄像头
+ * @param backgroundImageId:Int 0默认，1上台，2关闭摄像头，3嘉宾未签到，4嘉宾离线
  * @param coursewareWidth: Int 课件区真实宽
  * @return Promise | void
  */
 export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId = 0, extraStreamIds=[], coursewareWidth = 1280) => {
   let srcStreamInfos = [];
-  let bkImage='preset-id://262148633_live_closeCamera.png';
+  let bkImage='preset-id://'+cacheAppId+'_live_closeCamera.png';
+  defaultApi.writeLog(`avsdk ZEGO::startmixStreams default bkImage: ${bkImage}`);
   if (mixType === 0 || mixType === 1) {
     for (let i = 0, len = srcStreamIds.length; i < len; i++) {
       if (srcStreamIds[i].contentControl === 1) {
@@ -2155,10 +2159,16 @@ export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRt
     case 0:
       break;
     case 1:
-      bkImage = 'preset-id://262148633_live_TeacherOnStage.png';
+      bkImage = 'preset-id://'+cacheAppId+'_live_TeacherOnStage.png';
       break;
     case 2:
-      bkImage = 'preset-id://262148633_live_closeCamera.png';
+      bkImage = 'preset-id://'+cacheAppId+'_live_closeCamera.png';
+      break;
+    case 3:
+      bkImage = 'preset-id://'+cacheAppId+'_live_2022112202.png';
+      break;
+    case 4:
+      bkImage = 'preset-id://'+cacheAppId+'_live_2022112201.png';
       break;
     default:
       break;
@@ -2641,7 +2651,15 @@ const setAudioAuxSource = (source) => {
   });
 }
 
-//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器 /5:扬声器(音乐)（没有拉流，没有外部混音没有调用，没有麦克风）
+//设置嘉宾头像流id，headStreamID 空字符串代表无嘉宾
+const setCustomHeadStreamId = (headStreamID) => {
+  defaultApi.writeLog('info', 'avsdk ZEGO::setCustomHeadStreamId');
+  return callMethod('SetCustomHeadStreamId', {
+    headStreamID
+  });
+}
+
+//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器+外部混音 /:8麦克风+扬声器（含拉流，没有外部混音） /:16扬声器(音乐)（没有拉流，没有外部混音没有调用，没有麦克风）
 const setAUXAudioType = (type) => {
   defaultApi.writeLog('info', 'avsdk ZEGO::SetAUXAudioType');
   return callMethod('SetAUXAudioType', {
@@ -3217,6 +3235,7 @@ export default {
   getAllChannelIndex,
   startAudioExCapture,
   sendMediaSideInfo,
+  setCustomHeadStreamId,
   setAUXAudioType,
   loadCollectionInputEntry2,
   addListener,

package/src/zby-live-sdk.js

@@ -1512,6 +1512,12 @@ const zbysdk = {
     return zbyAVSDK.startAudioExCapture();
   },
 
+  //设置授课嘉宾头像流id
+  setCustomHeadStreamId (headStreamID) {
+    defaultApi.writeLog(`sdk action: setCustomHeadStreamId headStreamID:${headStreamID}`);
+    return zbyAVSDK.setCustomHeadStreamId(headStreamID);
+  },
+
   //RTC同屏 辅助通道音频类型
   setAUXAudioType(type) {
     defaultApi.writeLog(`sdk action: setAUXAudioType type:${type}`);