zby-live-sdk 1.0.49-beta-talrtc0831 → 1.0.49-beta-talrtc0920

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta-talrtc0831",
+  "version": "1.0.49-beta-talrtc0920",
   "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-beta-talrtc0831';
+export const version = '1.0.49-beta-talrtc0920';
 
 export const liveExt = {
   name: 'live',

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

@@ -52,6 +52,7 @@ let localRoomId = null;
 let userId = null;
 let isNoticeMicVolume = false;
 let enableLocalCapture = true; // 本地摄像头采集，默认允许
+let teacherId = null;
 // /**
 //   * 过滤直播云sdk中deviceId前缀
 //   * @param {string} deviceId
@@ -425,12 +426,13 @@ const init = async (args) => {
   localRoomId = args.roomId;
   userId = args.userId;
   localStreamId = args.streamId;
+  teacherId = args.teacherId;
   const _devices = {
     camera: (devices && devices.camera) || (usedDevices && usedDevices.camera && usedDevices.camera.use) || '',
     microphone: (devices && devices.microphone) || (usedDevices && usedDevices.microphone && usedDevices.microphone.use) || '',
     speaker: (devices && devices.speaker) || (usedDevices && usedDevices.speaker && usedDevices.speaker.use) || ''
   };
-  console.log('-> load talrtc sdk');
+  console.log('-> load talrtc sdk. teacherId: ', teacherId);
   await loadTalrtc(args.extensionVersion);
   console.log('-> load talrtc sdk finished ');
   const resp = await startEngine(args.appId, args.userId, args.usersign || '67890', 7, args.live_id);
@@ -454,6 +456,7 @@ const init = async (args) => {
 
       //rtc同屏以及高光时刻,都开启音频外部采集,默认传1
       await setAudioAuxSource(1);
+      teacherId = null;
     }
 
     if(args.noiseSuppressMode == -2) {
@@ -1498,6 +1501,8 @@ const startPush = async (streamId) => {
   if (streamId === screenStreamId) {
     isScreenSharing = true;
   }
+  setAudioType(4, localStreamId); // 设置采集类型，不用await，避免接口挂起导致未推流
+
   defaultApi.writeLog(`avsdk TALSDK::startPush streamId: ${streamId}`);
   try {
     if (!isFirstHeartBeatReport) {
@@ -1592,6 +1597,7 @@ const startPlay = (streamId, muteAudio, muteVideo) => {
   }
   defaultApi.writeLog(`avsdk TALSDK::startPlay streamId: ${streamId}, muteAudio: ${muteAudio}, muteVideo: ${muteVideo}`);
   return callMethod('StartPlay', {
+    myStreamId: localStreamId,
     streamId,
     muteAudio,
     muteVideo,
@@ -1864,10 +1870,19 @@ const setAudioAuxSource = (source) => {
   });
 };
 
-//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器
-const setAUXAudioType = (type) => {
-  defaultApi.writeLog('info', 'avsdk TALRTC::SetAUXAudioType');
-  return callMethod('SetAUXAudioType', {
+/**
+ * RTC流音频类型
+ * @param {number} type 音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器 5: 扬声器
+ * @param {string} streamId 流
+ * @returns {Promise<void>}
+ */
+const setAudioType = (type, streamId) => {
+  defaultApi.writeLog('info', 'avsdk TALRTC::SetAudioType');
+  if (!streamId) {
+    streamId = screenStreamId;
+  }
+  return callMethod('SetAudioType', {
+    streamId,
     type
   });
 };
@@ -1920,6 +1935,10 @@ export const setAudioMixMode = async (mixMode, streamIdArr) => {
   //   });
   // }
   if (!Array.isArray(streamIdArr)) return;
+
+  if (teacherId && !streamIdArr.includes(teacherId)) {
+    streamIdArr.push(teacherId);
+  }
   return callMethod('SetAudioMixMode', {mixMode: mixMode, streamIdArr, num: streamIdArr.length});
 };
 
@@ -1955,6 +1974,10 @@ const leaveRoom = async () => {
   previewIdToStreamId = {};
   streamIdRtcPlayerInfo = {};
   streamIdRtcPlayerInfo1 = {};
+  uiChnIndexs.length = 100;
+  uiChnIndexs.fill(0).forEach((value, index, array) => {
+    array[index] = array.length - (index + 1);
+  });
 };
 
 
@@ -2320,7 +2343,7 @@ export default {
   setMirrorStatus,
   setPlayViewMirror,
   setAudioAuxSource,
-  setAUXAudioType,
+  setAudioType,
   startAudioExCapture,
   startMultiScreen,
   setAudioMixMode,

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

@@ -1243,7 +1243,7 @@ export const getSnapshootId = (streamId) => {
     }
     break;
   case TALRTC:
-    if (zegosdk.hasStream(streamId)) {
+    if (talrtcsdk.hasStream(streamId)) {
       return talrtcsdk.getChannelIndex(streamId);
     } else {
       defaultApi.writeLog(`talrtcsdk getSnapshootId , no streamId: ${streamId} in talrtc room`);
@@ -1786,6 +1786,8 @@ export const setAUXAudioType = (type) => {
     break;
   case ZEGO:
     return zegosdk.setAUXAudioType(type);
+  case TALRTC:
+    return talrtcsdk.setAudioType(type);
   default:
     break;
   }

package/src/zby-live-sdk.js

@@ -198,6 +198,7 @@ function caculateDeatailArgs(baseArgs, cloudData) {
         extensionVersion: baseArgs.extension.version.agora || '1.0.0.0',
         appId: cloudData.appId,
         usersign: 'testsign',
+        teacherId: baseArgs.teacherId
       }),
       trtc: Object.assign({}, commonArgs, liveConfig, {
         extensionVersion: baseArgs.extension.version.trtc || '1.0.0.0',