zby-live-sdk 1.0.49-beta0927-1 → 1.0.49-beta1014-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta0927-1",
+  "version": "1.0.49-beta1014-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-beta0927-1';
+export const version = '1.0.49-beta1014-1';
 
 export const liveExt = {
   name: 'live',
@@ -110,8 +110,8 @@ const apiChangeSdkUrl = {
 
 //开启混流
 const apiMixStreams = {
-  test: 'https://tf-classroom-api-test.vdyoo.com',
-  online: 'https://tf-classroom-api-online.vdyoo.com'
+  test: 'https://tf-classroom-test.vdyoo.com',
+  online: 'https://tf-classroom-online.vdyoo.com'
 };
 
 export const getApiCloudBaseUrl = () => {

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采集声音
 }
 
@@ -1797,6 +1797,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,17 +1830,17 @@ export const getStreamType_zego = () => {
 const setThirdAudioCallbackType = (sdkType) => {
   let type = sdkVale[sdkType];
   return zegosdk.setThirdAudioType(type);
-}
+};
 
-const startMixStreams = (urls) => {
+const startMixStreams = (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds=[], coursewareWidth = 960) => {
   console.log('zego startmixStreams');
-  return zegosdk.startmixStreams(urls);
-}
+  return zegosdk.startmixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId, extraStreamIds, coursewareWidth);
+};
 
-const stopMixtStreams = (urls) => {
+const stopMixtStreams = (mixTaskId, targetUrls) => {
   console.log('zego stopMixtStreams');
-  return zegosdk.stopMixtStreams(urls);
-}
+  return zegosdk.stopMixtStreams(mixTaskId, targetUrls);
+};
 
 
 export default {

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

@@ -71,8 +71,6 @@ let currStreamIdRtcPlayerInfo ;
 //记录底层推流回调的值
 let dataZegoCapture = {};
 
-//记录推流id
-let streamIdList = [];
 /**
  * @function 调用端提供的回调方法
  * @param name:String 回调方法名
@@ -1798,10 +1796,8 @@ 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 (streamIdList.includes(streamId)) {
-    console.log('streamIdList is including this streamid', streamIdList, streamId);
-  } else {
-    streamIdList.push(streamId);
+  if (idx === 1) {
+    await callMethod("StartCapture", { publish_channel: idx });
   }
   if (typeof title === 'undefined') {
     title = 'none';
@@ -1864,6 +1860,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) {}
@@ -2081,130 +2080,222 @@ export const mixStream = (type, args, seq) => {
 
 };
 
-export const startmixStreams = async (targetUrl) => {
-  const zego = window.zbyAVSDK_init_params.zego;
- 
-  let rtcStreamId = `${zego.sid.slice(0,zego.sid.length-1)+2}` //'4000_345_123_2'
+/**
+ * @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关闭摄像头
+ * @param coursewareWidth: Int 课件区真实宽
+ * @return Promise | void
+ */
+export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId = 0, extraStreamIds=[], coursewareWidth = 960) => {
+  let srcStreamInfos = [];
+  let bkImage='preset-id://262148633_live_closeCamera.png';
+  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: 960,
+            bottom: 540,
+            contentControl: srcStreamIds[i].contentControl
+          });
+        } else if (i === 1) {
+          srcStreamInfos.push({
+            streamId: srcStreamIds[i].streamId,
+            left: 1008,
+            top: 0,
+            right: 1152,
+            bottom: 108,
+            contentControl: srcStreamIds[i].contentControl
+          });
+        }    
+      }      
+    }
+
+    let srcStreamInfos2 = [];
+    Object.assign(srcStreamInfos2, extraStreamIds);
+    if(srcStreamInfos2.length > 0) {
+      let factor = 960 / 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://262148633_live_TeacherOnStage.png';
+      break;
+    case 2:
+      bkImage = 'preset-id://262148633_live_closeCamera.png';
+      break;
+    default:
+      break;
+    }
+  }
+
+  const zego = window.zbyAVSDK_init_params.zego;  
   let param = {
-    institutionId: zego.institutionId,
-    taskId: zego.sid,
+    institutionId: window.zby_sdk_init_params.institutionId,
+    taskId: mixTaskId,
     userId: zego.userId,
-    streamIds: streamIdList,
-    rtcStreamId,
-    pushUrls: targetUrl //数组
-  }
+    streamInfos: srcStreamInfos,
+    rtcStreamId: targetRtcStreamId,
+    pushUrls: targetUrls, //数组
+    backgroundImage: bkImage
+  };
+
+  defaultApi.writeLog(`startMixStreams params:${JSON.stringify(param)}`);
+
   let res = await mixStreamsStart(param);
   if (res.code == 0) {
     console.log('混流成功:', res);
-  } else {
-    console.log('startmixStream local start……');
-    return callMethod('MixStreamEx', {
-      mixstreamid: zego.sid,
-      config: {
-        nOutputFps: 15,
-        nOutputBitrate: 512000,
-        nOutputAudioBitrate: 48000,
-        nOutputWidth: 1280,
-        nOutputHeight: 720,
-        nOutputAudioConfig: 0,
-        pUserData: '',
-        nLenOfUserData: 0,
-        pInputStreamList: [
-          {
-            szStreamID: streamIdList[1],//截屏窗
-            layout: { left: 0, top: 0, right: 1040, bottom: 720 },
-            uSoundLevelID: 1234,
-            nContentControl: 0,
-            nVolume: 100,
-            bAudioFocus: false,
-            nAudioDirection: -1,
-            renderMode: 0
-          },
-          {
-            szStreamID: streamIdList[0],//头像
-            layout: { left: 1040, top: 0, right: 1280, bottom: 180 },
-            uSoundLevelID: 3232,
-            nContentControl: 0,
-            nVolume: 100,
-            bAudioFocus: false,
-            nAudioDirection: -1,
-            renderMode: 0
-          }
-        ],
-        nInputStreamCount: 2,
-        pOutputList: [
-          {
-            isUrl: true,    // 输出是否为流名或URL
-            target: targetUrl[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: '',
-      }
-    }) 
-  }
+  }  else {
+    console.log('混流失败:', 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,
+  //     }
+  //   });
+  // }
 
  
 };
 
-export const stopMixtStreams = async (targetUrl) => {
+export const stopMixtStreams = async (mixTaskId, targetUrls) => {
   const zego = window.zbyAVSDK_init_params.zego;
   let param = {
-    taskId: zego.sid,
+    taskId: mixTaskId,
     userId: zego.userId
-  }
+  };
   let res = await mixStreamsStop(param);
   if (res.code == 0) {
     console.log('停止混流成功:', res);
   } else {
-    return callMethod('MixStreamEx', {
-      mixstreamid: zego.sid,
-      config: {
-        nOutputFps: 15,
-        nOutputBitrate: 512000,
-        nOutputAudioBitrate: 48000,
-        nOutputWidth: 1280,
-        nOutputHeight: 720,
-        nOutputAudioConfig: 0,
-        pUserData: '',
-        nLenOfUserData: 0,
-        pInputStreamList: [],
-        nInputStreamCount: 2,
-        pOutputList: [
-          {
-            isUrl: true,    // 输出是否为流名或URL
-            target: targetUrl[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: '',
-      }
-    }) 
-  }
+    console.log('停止混流失败:', 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: '',
+  //     }
+  //   });
+  // }
 };
 
 

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();
@@ -1510,24 +1514,30 @@ const zbysdk = {
 
   //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(urls) {
-    defaultApi.writeLog('sdk action: startMixStream');
-    return zbyAVSDK.startMixStreams(urls);
+  startMixStreams(mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId=0, extraStreamIds=[], coursewareWidth = 960) {
+    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(urls) {
-    defaultApi.writeLog('sdk action: stopMixtStreams');
-    return zbyAVSDK.stopMixtStreams(urls);
+  stopMixtStreams(mixTaskId, targetUrls) {
+    defaultApi.writeLog(`sdk action: stopMixtStreams mixTaskId:${mixTaskId} targetUrls:${targetUrls}`);
+    return zbyAVSDK.stopMixtStreams(mixTaskId, targetUrls);
   },
 
   /**