zby-live-sdk 1.0.49-beta-talrtc1104-2 → 1.0.49-beta-1222-1

package/package.json

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

package/src/notice.js

@@ -180,6 +180,12 @@ export default {
       data
     });
   },
+  streamAbnormalLoss(data) {
+    notice({
+      type:'stream_abnormal_loss',
+      data
+    });
+  },
 
   // ----------播放器--------
   // 播放出错

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

@@ -1408,8 +1408,9 @@ export const pullAudioFlow = (playerId, operation, operator, streamid) => {
   defaultApi.writeLog(`pullAudioFlow -- playerId ${playerId} operation ${operation} streamId ${streamid}`);
   if(streamid){
     if(streamIdToRtcPlayerId[streamid] == undefined) {
-        NOTICE.pullAudioFlowError({streamid})
-        return 
+      NOTICE.pullAudioFlowError({ streamid });
+      NOTICE.streamAbnormalLoss({ streamid, userid: util.getUidByStreamId(streamid), type: 'audio' });
+      return;
     }else{
       playerId = streamIdToRtcPlayerId[streamid]
       console.log('pullAudioFlow-playerId',playerId,streamIdToPreviewId)
@@ -1453,6 +1454,11 @@ export const controlPullAudioOnly = (streamId, audioOnly) => {
   } catch (e) {
     console.log('controlPullAudioOnly_rtc ::streamIdRtcPlayerInfo1--error',e);
   }
+  if (streamId) {
+    if ( streamIdToRtcPlayerId[streamId] == undefined) {
+      NOTICE.streamAbnormalLoss({ streamid: streamId, userid: util.getUidByStreamId(streamId), type: 'video' });
+    }
+  }
   const rtcPlayerId = streamIdToRtcPlayerId[streamId];
   return callMethod('ControlPullAudioOnly', {
     id: rtcPlayerId,

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

@@ -1809,11 +1809,13 @@ const pullAudioFlow = (playerId, mute, streamid) => {
 
 /**
   * @function 设置镜像状态(预览)
-  * @param { boolean } type true=开启 false=关闭
-  * @return: Promise
+  * @param { number } mode 1=开启 0=关闭
+  * @return {Promise}
   */
-const setMirrorStatus = (isMirror) => {
-  return callMethod('SetMirrorStatus', { isMirror, streamId: localStreamId });
+const setMirrorStatus = (mode) => {
+  const realId = mode == 0 ? 2 : 3;
+  defaultApi.writeLog(`avsdk TALRTC::setMirrorStatus, mode: ${mode}, streamId:${localStreamId}, realId:${realId}`);
+  return callMethod('SetMirrorStatus', { mode: realId, streamId: localStreamId });
 };
 
 /**

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

@@ -20,6 +20,11 @@ const rtcReportUrl = {
   test: 'test-r.weclassroom.com',
   online: 'r.weclassroom.com'
 };
+const sdkVale = {
+  zego: 8,    //8代表zego采集麦克风+扬声器
+  talrtc: 101,    //101代表talrtc采集声音
+  trtc: 102,    //102代表trtc采集声音
+}
 
 /**
  * @function 设备检测初始化
@@ -1592,8 +1597,7 @@ export const setPushViewMirror = (mode) => {
   case ZEGO:
     return zegosdk.setVideoMirrorMode(mode);
   case TALRTC:
-    // FIXME METHOD_NOT_IMPLEMENT;
-    break;
+    return talrtcsdk.setMirrorStatus(mode);
   default:
     break;
   }
@@ -1808,6 +1812,11 @@ export const getStreamType_zego = () => {
   }
 };
 
+const setThirdAudioCallbackType = (sdkType) => {
+  let type = sdkVale[sdkType];
+  return zegosdk.setThirdAudioType(type);
+}
+
 
 export default {
   init,
@@ -1886,6 +1895,7 @@ export default {
   sendMediaSideInfo,
   enableHighlight,
   setAUXAudioType,
-  mixedstuVideo
+  mixedstuVideo,
+  setThirdAudioCallbackType
   // getDeviceState
 };

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

@@ -2093,8 +2093,9 @@ export const pullAudioFlow = (playerId, operation, streamid) => {
   defaultApi.writeLog(`pullAudioFlow -- playerId ${playerId} operation ${operation} streamId ${streamid}`);
   if(streamid){
     if(streamIdToPreviewId[streamid] == undefined) {
-        NOTICE.pullAudioFlowError({streamid})
-        return 
+      NOTICE.pullAudioFlowError({ streamid });
+      NOTICE.streamAbnormalLoss({ streamid, userid: util.getUidByStreamId(streamid), type: 'audio' });
+      return;
     }else{
       playerId = streamIdToPreviewId[streamid]
       console.log('pullAudioFlow-playerId',playerId,streamIdToPreviewId)
@@ -2136,6 +2137,11 @@ export const activateVideoPlayStream = (streamId, bActive) => {
   } catch (e) {
     console.log('activateVideoPlayStream ::streamIdRtcPlayerInfo1 --error',e);
   }
+  if (streamId) {
+    if (streamIdToPreviewId[streamId] == undefined) {
+      NOTICE.streamAbnormalLoss({ streamId, userid: util.getUidByStreamId(streamId), type: 'video' });
+    }
+  }
   return callMethod('ActivateVideoPlayStream', {
     nChannelIdx: streamIdToPreviewId[streamId],
     bActive
@@ -2410,7 +2416,7 @@ const setAudioAuxSource = (source) => {
   });
 }
 
-//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器
+//RTC同屏 辅助通道音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器 /5:扬声器(音乐)（没有拉流，没有外部混音没有调用，没有麦克风）
 const setAUXAudioType = (type) => {
   defaultApi.writeLog('info', 'avsdk ZEGO::SetAUXAudioType');
   return callMethod('SetAUXAudioType', {
@@ -2425,6 +2431,14 @@ const startAudioExCapture = (channel) => {
     channel
   });
 }
+/**
+   * @function 设置第三路流音频类型
+   * @param {number} type 音频类型  0：静音 / 1:麦克风  / 2：拉流的声音  / 3：1+2 / 4：麦克风+扬声器(音乐+拉流)(带外部混音) /8:麦克风+扬声器(音乐+拉流)(不带外部混音)/16:扬声器(音乐)（没有拉流，没有外部混音，没有麦克风）
+   * @return: Promise
+  */
+const setThirdAudioType = (type) => {
+  return callMethod('SetThirdAudioType', { type })
+};
 
 //加载截屏插件
 const LoadCollectionOutputEntry2 = () => {
@@ -2983,5 +2997,6 @@ export default {
   addListener,
   stopCheckDevice,
   getDeviceCheckInitStatus,
-  setDeviceCheckInitStatus
+  setDeviceCheckInitStatus,
+  setThirdAudioType
 };

package/src/zby-live-sdk.js

@@ -388,6 +388,7 @@ const zbysdk = {
     defaultApi.writeLog(`sdk status : setAudioCallbackType , sdk_type : ${sdk_type}`);
     try {
       await liveBaseApi.setAudioCallbackType(sdk_type);
+      await zbyAVSDK.setThirdAudioCallbackType(sdk_type);
     } catch (e) {
       defaultApi.writeLog(`sdk status : setAudioCallbackType , error : ${JSON.stringify(e)}`);
     }; 
@@ -580,7 +581,9 @@ const zbysdk = {
       }
 
       try {
+        console.log('开始设置rtmp声音回调',sdk_type);
         await liveBaseApi.setAudioCallbackType(sdk_type);
+        await zbyAVSDK.setThirdAudioCallbackType(sdk_type);
       } catch (error) {
         defaultApi.writeLog(`setAudioCallbackType error : ${JSON.stringify(error)}`);
       }