zby-live-sdk 1.0.49-beta20221223 → 1.0.49-beta20230302

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta20221223",
+  "version": "1.0.49-beta20230302",
   "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-beta20221223';
+export const version = '1.0.49-beta20230302';
 
 export const liveExt = {
   name: 'live',
@@ -108,11 +108,22 @@ const apiChangeSdkUrl = {
   online: 'https://cloud-platform-live.speiyou.com/cloud-platform'
 };
 
+//开启混流
+const apiMixStreams = {
+  test: 'https://tf-classroom-test.vdyoo.com',
+  online: 'https://tf-classroom-online.vdyoo.com'
+};
+
 export const getApiCloudBaseUrl = () => {
   const {env} = config;
   return apiCloudUrl[env];
 };
 
+export const getApiMixStreams = () => {
+  const {env} = config;
+  return apiMixStreams[env];
+}
+
 export const getApiChangeSdkUrl = () => {
   const {env} = config;
   return apiChangeSdkUrl[env];

package/src/network/api.js

@@ -7,7 +7,7 @@
  * @FilePath: \1705\zby_live_sdk\src\network\api.js
  */
 import commonFetch from './commonFetch.js';
-import {getReportBaseUrl, getApiCloudBaseUrl, getCloudApiDomain, getApiChangeSdkUrl, timestampUrl} from '../config/config.js';
+import {getReportBaseUrl, getApiCloudBaseUrl, getCloudApiDomain, getApiChangeSdkUrl, timestampUrl, getApiMixStreams} from '../config/config.js';
 import util from '../util/util';
 
 //获取信道服务器地址
@@ -48,3 +48,12 @@ export function dabanDataReport(param){
 export function changeSdkInRoom(param){
   return commonFetch(`${getApiChangeSdkUrl()}/rtccloud/sdk/set/lecture/client`, param, 'FROMDATA');
 }
+
+//开始混流
+export function mixStreamsStart(param) {
+  return commonFetch(`${getApiMixStreams()}/rtc-backend/mix/stream/start`, param, 'POST');
+}
+//结束混流
+export function mixStreamsStop(param) {
+  return commonFetch(`${getApiMixStreams()}/rtc-backend/mix/stream/end`, param, 'POST');
+}

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

@@ -21,8 +21,8 @@ const rtcReportUrl = {
   online: 'r.weclassroom.com'
 };
 const sdkVale = {
-  zego: 8,    //8代表zego采集麦克风+扬声器
-  talrtc: 101,    //101代表talrtc采集声音
+  zego: 4,      //4代表zego采集麦克风+扬声器+拉流声音+外部混音
+  talrtc: 101,  //101代表talrtc采集声音
   trtc: 102,    //102代表trtc采集声音
 }
 
@@ -83,7 +83,7 @@ export const deviceCheckerInit = async (extension, env) => {
     });
     window.zbyAVSDK_init_sdk_type = 'zego';
   }
-  defaultApi.writeLog('change zbyAVSDK_init_sdk_type to rtc , from avsdk device check init');
+  defaultApi.writeLog('change zbyAVSDK_init_sdk_type to zego , from avsdk device check init');
 };
 
 /**
@@ -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
@@ -1797,6 +1812,21 @@ export const setAUXAudioType = (type) => {
   }
 };
 
+/**
+  * @function 开启音频外部采集
+  * @return: Promise
+  */
+export const setThirdAudioType = (type) => {
+  switch (window.zbyAVSDK_init_sdk_type) {
+  case RTC:
+    break;
+  case ZEGO:
+    return zegosdk.setThirdAudioType(type);
+  default:
+    break;
+  }
+};
+
 /**
   * @function 判断推流类型
   * @return: Promise
@@ -1815,7 +1845,17 @@ export const getStreamType_zego = () => {
 const setThirdAudioCallbackType = (sdkType) => {
   let type = sdkVale[sdkType];
   return zegosdk.setThirdAudioType(type);
-}
+};
+
+const startMixStreams = (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds=[], coursewareWidth = 1280) => {
+  console.log('zego startmixStreams');
+  return zegosdk.startmixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds, coursewareWidth);
+};
+
+const stopMixtStreams = (mixTaskId, targetUrls) => {
+  console.log('zego stopMixtStreams');
+  return zegosdk.stopMixtStreams(mixTaskId, targetUrls);
+};
 
 
 export default {
@@ -1894,8 +1934,12 @@ export default {
   startSoundLevelMonitor,
   sendMediaSideInfo,
   enableHighlight,
+  setCustomHeadStreamId,
   setAUXAudioType,
+  setThirdAudioType,
   mixedstuVideo,
-  setThirdAudioCallbackType
+  setThirdAudioCallbackType,
+  startMixStreams,
+  stopMixtStreams
   // getDeviceState
 };

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

@@ -6,6 +6,7 @@
  **/
 import {dabanDataReport} from '../network/api.js';
 import dataReport from '../network/dataReport.js';
+import { mixStreamsStart,mixStreamsStop } from '../network/api';
 import {
   getS,
   setS,
@@ -55,6 +56,8 @@ let hasNetWrong = false;
 const classType = 0;
 // 监听id
 let EMListenerId = 0;
+// 缓存上层传入的AppId
+let cacheAppId = 0;
 
 //静音推流时，音量值是否上抛上层标志 false=没有声音不往上层通知/true=有声音有上层通知
 let isNoticeMicVolumeZego = false;
@@ -69,6 +72,7 @@ let currStreamIdRtcPlayerInfo ;
 
 //记录底层推流回调的值
 let dataZegoCapture = {};
+
 /**
  * @function 调用端提供的回调方法
  * @param name:String 回调方法名
@@ -190,7 +194,10 @@ const addListener = (userId, userName, confId, nNetType, devices) => {
             afterInitSDK(userId, userName, confId, nNetType, devices);
           }
         }
-        break;
+          break;
+        case 'OnMixStreamEx':
+          console.log('OnMixStreamEx',data)
+          break;
       case 'OnLoginChannel':
         var status = JSON.parse(data).uiErrorCode;
         defaultApi.writeLog(`ZEGO::addListener-- OnLoginChannel: ${status}`);
@@ -599,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,
@@ -745,7 +753,7 @@ export const stopCheckDevice = async() => {
   removerListener();
   await stopSoundLevelMonitor();
   await stopPreview();
-  defaultApi.writeLog('rtc stopCheckDevice and removerListener and captureDestroy');
+  defaultApi.writeLog('zego stopCheckDevice and removerListener and captureDestroy');
   return callMethod('DestroyEngine', {});
 };
 
@@ -1791,11 +1799,14 @@ export const setDefaultDevice = async (devices, operationType) => {
  */
 export const startPublish2 = async (streamid, idx, title, flag, seq) => {
   const streamId = streamid || window.zbyAVSDK_init_params.zego.streamId;
+  if (idx === 1) {
+    await callMethod("StartCapture", { publish_channel: idx });
+  }
   if (typeof title === 'undefined') {
     title = 'none';
   }
   if (typeof flag === 'undefined') {
-    flag = 0;
+    flag = 1;
   }
   if (typeof seq === 'undefined') {
     seq = 0;
@@ -1852,6 +1863,9 @@ export const stopPublish = (idx, msg, flag) => {
   if (typeof idx === 'undefined') {
     idx = 0;
   }
+  if (idx === 1) {
+    callMethod('StopCapture',{publish_channel:idx});
+  }
   // try {
   //   dataReport.stopPublish({publish_streamid:window.zbyAVSDK_init_params.zego.streamId});
   // } catch (error) {}
@@ -1962,7 +1976,7 @@ export const playStream = (streamId, uiChnIndex, pInfo) => {
 export const stopPlayStream = async (streamId, recovery) => {
   const id = streamIdToPreviewId[streamId];
   delete streamIdRtcPlayerInfo[streamId];
-  if (recovery && id != undefined && !uiChnIndexs.includes(id)) {
+  if (recovery && id && !uiChnIndexs.includes(id)) {
     uiChnIndexs.push(id);
     defaultApi.writeLog(`avsdk ZEGO::stopPlayStream streamId: ${streamId} id: ${id} uiChnIndexs: ${uiChnIndexs}`);
     delete streamIdToPreviewId[streamId];
@@ -1982,7 +1996,7 @@ export const stopAllPlayStream = () => {
   for (let streamId in streamIdToPreviewId) {
     if (streamIdToPreviewId.hasOwnProperty(streamId)) {
       const id = streamIdToPreviewId[streamId];
-      if (id != undefined && !uiChnIndexs.includes(id)) {
+      if (id && !uiChnIndexs.includes(id)) {
         uiChnIndexs.push(id);
         toRecoveryArr.push(callMethod('StopPlayStream', {
           pszStreamID: streamId
@@ -2069,6 +2083,237 @@ export const mixStream = (type, args, seq) => {
 
 };
 
+/**
+ * @function 切换播放流
+ * @param mixTaskId:String 任务ID，混流任务唯一标识 必选
+ * @param mixType:Int 0-web, 1-record, 2-Chat, 3-H5 必选
+ * @param srcStreamIds:Array 课件+老师头像流ID ['stream_1','stream_2'] 必选
+ * @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关闭摄像头，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://'+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) {
+        srcStreamInfos.push({
+          streamId: srcStreamIds[i].streamId,
+          left: null,
+          top: null,
+          right: null,
+          bottom: null,
+          contentControl: srcStreamIds[i].contentControl
+        });
+      } else {
+        if (i === 0) {
+          srcStreamInfos.push({
+            streamId: srcStreamIds[i].streamId,
+            left: 0,
+            top: 0,
+            right: 1280,
+            bottom: 720,
+            contentControl: srcStreamIds[i].contentControl
+          });
+        } else if (i === 1) {
+          srcStreamInfos.push({
+            streamId: srcStreamIds[i].streamId,
+            left: 1344,
+            top: 0,
+            right: 1536,
+            bottom: 144,
+            contentControl: srcStreamIds[i].contentControl
+          });
+        }    
+      }      
+    }
+
+    let srcStreamInfos2 = [];
+    Object.assign(srcStreamInfos2, extraStreamIds);
+    if(srcStreamInfos2.length > 0) {
+      let factor = 1280 / coursewareWidth;
+      srcStreamInfos2.forEach( item => {
+        item.left = parseInt(item.left * factor);
+        item.top = parseInt(item.top * factor);
+        item.right = parseInt(item.right * factor);
+        item.bottom = parseInt(item.bottom * factor);
+        if (((item.right - item.left) % 2) != 0) {
+          item.right = item.right - 1;
+        }
+        if (((item.bottom - item.top) % 2) != 0) {
+          item.bottom = item.bottom - 1;
+        }
+      });
+
+      srcStreamInfos = srcStreamInfos.concat(srcStreamInfos2);
+
+      defaultApi.writeLog(`srcStreamInfos---------- params:${JSON.stringify(srcStreamInfos)}`);
+    }
+    
+    switch (backgroundImageId) {
+    case 0:
+      break;
+    case 1:
+      bkImage = 'preset-id://'+cacheAppId+'_live_TeacherOnStage.png';
+      break;
+    case 2:
+      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;
+    case 5:
+      bkImage = 'preset-id://'+cacheAppId+'_live_167210592069086983.png';
+      break;
+    default:
+      break;
+    }
+  }
+
+  const zego = window.zbyAVSDK_init_params.zego;  
+  let param = {
+    institutionId: window.zby_sdk_init_params.institutionId,
+    taskId: mixTaskId,
+    userId: zego.userId,
+    streamInfos: srcStreamInfos,
+    rtcStreamId: targetRtcStreamId,
+    pushUrls: targetUrls, //数组
+    backgroundImage: bkImage,
+    streamOutPut:{width:1600,height:720,videoBitrate:1500000,fps:20}
+  };
+
+  defaultApi.writeLog(`startMixStreams params:${JSON.stringify(param)}`);
+
+  let res = await mixStreamsStart(param);
+  if (res.code == 0) {
+    console.log('混流成功:', JSON.stringify(res));
+  }  else {
+    console.log('混流失败:', JSON.stringify(res));
+  }
+  // else {
+  //   console.log('startmixStream local start……');
+  //   return callMethod('MixStreamEx', {
+  //     mixstreamid: mixTaskId,
+  //     config: {
+  //       nOutputFps: 15,
+  //       nOutputBitrate: 512000,
+  //       nOutputAudioBitrate: 48000,
+  //       nOutputWidth: 1200,
+  //       nOutputHeight: 540,
+  //       nOutputAudioConfig: 0,
+  //       pUserData: '',
+  //       nLenOfUserData: 0,
+  //       pInputStreamList: [
+  //         {
+  //           szStreamID: streamIdList[1],//截屏窗
+  //           layout: { left: 0, top: 0, right: 960, bottom: 540 },
+  //           uSoundLevelID: 1234,
+  //           nContentControl: 0,
+  //           nVolume: 100,
+  //           bAudioFocus: false,
+  //           nAudioDirection: -1,
+  //           renderMode: 0
+  //         },
+  //         {
+  //           szStreamID: streamIdList[0],//头像
+  //           layout: { left: 1008, top: 0, right: 1152, bottom: 108 },
+  //           uSoundLevelID: 3232,
+  //           nContentControl: 0,
+  //           nVolume: 100,
+  //           bAudioFocus: false,
+  //           nAudioDirection: -1,
+  //           renderMode: 0
+  //         }
+  //       ],
+  //       nInputStreamCount: 2,
+  //       pOutputList: [
+  //         {
+  //           isUrl: true,    // 输出是否为流名或URL
+  //           target: targetUrls[0], //isUrl=ture完整的RTMP URL，false是流名
+  //           videoCodec: 0,
+  //           videoBitrate: 0,
+  //           encodeProfile: 1,
+  //           encodeLatency: 0
+  //         }
+  //         // {
+  //         //   isUrl: false,
+  //         //   target: "streamId",
+  //         //   videoCodec: 0,
+  //         //   videoBitrate: 0,
+  //         //   encodeProfile: 1,
+  //         //   encodeLatency: 0
+  //         // }
+  //       ],
+  //       nOutputStreamCount: 1,
+  //       pOutputBackgroundImage: bkImage,
+  //     }
+  //   });
+  // }
+
+  return res;
+};
+
+export const stopMixtStreams = async (mixTaskId, targetUrls) => {
+  const zego = window.zbyAVSDK_init_params.zego;
+  let param = {
+    taskId: mixTaskId,
+    userId: zego.userId
+  };
+  let res = await mixStreamsStop(param);
+  if (res.code == 0) {
+    console.log('停止混流成功:', JSON.stringify(res));
+  } else {
+    console.log('停止混流失败:', JSON.stringify(res));
+  }
+  // else {
+  //   return callMethod('MixStreamEx', {
+  //     mixstreamid: mixTaskId,
+  //     config: {
+  //       nOutputFps: 15,
+  //       nOutputBitrate: 512000,
+  //       nOutputAudioBitrate: 48000,
+  //       nOutputWidth: 1280,
+  //       nOutputHeight: 720,
+  //       nOutputAudioConfig: 0,
+  //       pUserData: '',
+  //       nLenOfUserData: 0,
+  //       pInputStreamList: [],
+  //       nInputStreamCount: 2,
+  //       pOutputList: [
+  //         {
+  //           isUrl: true,    // 输出是否为流名或URL
+  //           target: targetUrls[0], //isUrl=ture完整的RTMP URL，false是流名
+  //           videoCodec: 0,
+  //           videoBitrate: 0,
+  //           encodeProfile: 1,
+  //           encodeLatency: 0
+  //         }
+  //         // {
+  //         //   isUrl: false,
+  //         //   target: "streamId",
+  //         //   videoCodec: 0,
+  //         //   videoBitrate: 0,
+  //         //   encodeProfile: 1,
+  //         //   encodeLatency: 0
+  //         // }
+  //       ],
+  //       nOutputStreamCount: 1,
+  //       pOutputBackgroundImage: '',
+  //     }
+  //   });
+  // }
+  return res;
+};
+
+
 /**
  * @function 是否拉取音频流--通过流id控制
  * @param streamId:String 被拉取的流的 id，必选
@@ -2410,7 +2655,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', {
@@ -2986,11 +3239,14 @@ export default {
   getAllChannelIndex,
   startAudioExCapture,
   sendMediaSideInfo,
+  setCustomHeadStreamId,
   setAUXAudioType,
   loadCollectionInputEntry2,
   addListener,
   stopCheckDevice,
   getDeviceCheckInitStatus,
   setDeviceCheckInitStatus,
-  setThirdAudioType
+  setThirdAudioType,
+  startmixStreams,
+  stopMixtStreams
 };

package/src/zby-live-sdk.js

@@ -282,6 +282,10 @@ const zbysdk = {
 
   // 结束设备检测
   stopCheckDevice() {
+    if (deviceCheckerInitStatus === -1) {
+      defaultApi.writeLog('please start check device first');
+      return 'please start check device first';
+    }
     deviceCheckerInitStatus = -1;
     defaultApi.writeLog('sdk stop check device');
     return zbyAVSDK.stopCheckDevice();
@@ -1508,18 +1512,40 @@ 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');
+    defaultApi.writeLog(`sdk action: setAUXAudioType type:${type}`);
     return zbyAVSDK.setAUXAudioType(type);
   },
 
+  //RTC同屏 辅助通道音频类型
+  setThirdAudioType(type) {
+    defaultApi.writeLog(`sdk action: setThirdAudioType type:${type}`);
+    return zbyAVSDK.setThirdAudioType(type);
+  },
+
   //发送sei
   sendMediaSideInfo(info) {
     defaultApi.writeLog('sdk action: sendMediaSideInfo');
     return zbyAVSDK.sendMediaSideInfo(info);
   },
 
+  startMixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId=0, extraStreamIds=[], coursewareWidth = 1280) {
+    defaultApi.writeLog(`sdk action: startMixStreams mixTaskId:${mixTaskId} mixType:${mixType} srcStreamIds:${JSON.stringify(srcStreamIds)} targetRtcStreamId:${targetRtcStreamId} targetUrls:${JSON.stringify(targetUrls)} backgroundImageId:${backgroundImageId} extraStreamIds:${JSON.stringify(extraStreamIds)} coursewareWidth:${coursewareWidth}`);
+    return zbyAVSDK.startMixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds, coursewareWidth);
+  },
+
+  stopMixtStreams(mixTaskId, targetUrls) {
+    defaultApi.writeLog(`sdk action: stopMixtStreams mixTaskId:${mixTaskId} targetUrls:${targetUrls}`);
+    return zbyAVSDK.stopMixtStreams(mixTaskId, targetUrls);
+  },
+
   /**
     * @function 切换sdk类型
     * @return: Promise