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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta0927-1",
+  "version": "1.0.49-beta1008-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-beta1008-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
@@ -1817,9 +1832,9 @@ const setThirdAudioCallbackType = (sdkType) => {
   return zegosdk.setThirdAudioType(type);
 }
 
-const startMixStreams = (urls) => {
+const startMixStreams = (srcStreamIds, urls) => {
   console.log('zego startmixStreams');
-  return zegosdk.startmixStreams(urls);
+  return zegosdk.startmixStreams(srcStreamIds, urls);
 }
 
 const stopMixtStreams = (urls) => {

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

@@ -1801,7 +1801,12 @@ export const startPublish2 = async (streamid, idx, title, flag, seq) => {
   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});
+      streamIdList.unshift(streamId);
+    } else {
+      streamIdList.push(streamId);
+    }
   }
   if (typeof title === 'undefined') {
     title = 'none';
@@ -1864,6 +1869,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,15 +2089,15 @@ export const mixStream = (type, args, seq) => {
 
 };
 
-export const startmixStreams = async (targetUrl) => {
+export const startmixStreams = async (srcStreamIds, targetUrl) => {
   const zego = window.zbyAVSDK_init_params.zego;
  
   let rtcStreamId = `${zego.sid.slice(0,zego.sid.length-1)+2}` //'4000_345_123_2'
   let param = {
-    institutionId: zego.institutionId,
+    institutionId: window.zby_sdk_init_params.institutionId,
     taskId: zego.sid,
     userId: zego.userId,
-    streamIds: streamIdList,
+    streamIds: srcStreamIds, // 数组
     rtcStreamId,
     pushUrls: targetUrl //数组
   }
@@ -2104,15 +2112,15 @@ export const startmixStreams = async (targetUrl) => {
         nOutputFps: 15,
         nOutputBitrate: 512000,
         nOutputAudioBitrate: 48000,
-        nOutputWidth: 1280,
-        nOutputHeight: 720,
+        nOutputWidth: 1200,
+        nOutputHeight: 540,
         nOutputAudioConfig: 0,
         pUserData: '',
         nLenOfUserData: 0,
         pInputStreamList: [
           {
             szStreamID: streamIdList[1],//截屏窗
-            layout: { left: 0, top: 0, right: 1040, bottom: 720 },
+            layout: { left: 0, top: 0, right: 960, bottom: 540 },
             uSoundLevelID: 1234,
             nContentControl: 0,
             nVolume: 100,
@@ -2122,7 +2130,7 @@ export const startmixStreams = async (targetUrl) => {
           },
           {
             szStreamID: streamIdList[0],//头像
-            layout: { left: 1040, top: 0, right: 1280, bottom: 180 },
+            layout: { left: 1008, top: 0, right: 1152, bottom: 108 },
             uSoundLevelID: 3232,
             nContentControl: 0,
             nVolume: 100,
@@ -2151,7 +2159,7 @@ export const startmixStreams = async (targetUrl) => {
           // }
         ],
         nOutputStreamCount: 1,
-        pOutputBackgroundImage: '',
+        pOutputBackgroundImage: 'preset-id://262148633_live_pink.png',
       }
     }) 
   }

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();
@@ -1514,15 +1518,21 @@ const zbysdk = {
     return zbyAVSDK.setAUXAudioType(type);
   },
 
+  //RTC同屏 辅助通道音频类型
+  setThirdAudioType(type) {
+    defaultApi.writeLog('sdk action: setThirdAudioType');
+    return zbyAVSDK.setThirdAudioType(type);
+  },
+
   //发送sei
   sendMediaSideInfo(info) {
     defaultApi.writeLog('sdk action: sendMediaSideInfo');
     return zbyAVSDK.sendMediaSideInfo(info);
   },
 
-  startMixStreams(urls) {
+  startMixStreams(srcStreamIds, urls) {
     defaultApi.writeLog('sdk action: startMixStream');
-    return zbyAVSDK.startMixStreams(urls);
+    return zbyAVSDK.startMixStreams(srcStreamIds, urls);
   },
 
   stopMixtStreams(urls) {