zby-live-sdk 1.0.48-beta0726-1 → 1.0.49-beta0825-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.48-beta0726-1",
+  "version": "1.0.49-beta0825-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.48-beta0726-1';
+export const version = '1.0.49-beta0825-1';
 
 export const liveExt = {
   name: 'live',

package/src/live/base.js

@@ -7,7 +7,12 @@
  */
 import callMethod from './call-method';
 import {liveExt} from '../config/config';
-
+let sdkVale = {
+  zego: 0,
+  talrtc: 1,
+  trtc: 2,
+  rtc:3
+}
 export default {
   async getLiveSdkVersion() {
     return callMethod('GetLiveSdkVersion', {});
@@ -18,6 +23,12 @@ export default {
   async isStreamVideoMuted() {
     return callMethod('IsStreamVideoMuted', {});
   },
+  //设置相应的sdk声音回调给到tm，解决回放关麦依旧有声音问题
+  async setAudioCallbackType(sdkType) {
+    let audio_source = sdkVale[sdkType]
+    console.log('setAudioCallbackType audio_source:', audio_source);
+    return callMethod('SetExternalAudioSource', {audio_source});
+  },
   // 初始化
   init(){
     // 加载扩展

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

@@ -89,6 +89,17 @@ const unloadUtils = () => {
   }
 };
 
+export const isAppleM1 = () => {
+  defaultApi.writeLog(`获取设备是否是M1设备: isAppleM1 --start`);
+  return new Promise((resolve,reject) => {
+    EM.system.IsAppleSilicon((code, msg) => {
+      defaultApi.writeLog(`获取设备是否是M1设备: isAppleM1 code:${code} msg:${msg}`);
+      let data = JSON.parse(msg);
+      resolve({ code, data });
+      });
+  })
+};
+
  /**
   * @function 获取设备状态
   * * @param { string  } devicename //（设备名称，可为空）

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

@@ -387,6 +387,11 @@ const init = async (args) => {
     //坐立模式开启外部采集器，站立关闭外部采集器,只有小组课坐立模式才会调用，通过这个把rtmp数据给到zego或者rtc(头像),开启了外部采集，zego不会再本地采集数据
     await setEnableExternVideoCapture(true);
   }
+  //小班课 需要加载采集插件的输入数据,为了拼接zego头像
+  if (args.classMode === 1 || args.classMode === 2) {
+    defaultApi.writeLog('loadCollectionInputEntry')
+    loadCollectionInputEntry();
+  };
   await setCameraEncodeBiarate(args.encodeCaptureBitrate);
   await setCameraEncodeFps(args.encodeCaptureFps);
   await setCameraCaptureResolution(args.previewResolutionWidth, args.previewResolutionHeight);
@@ -1405,6 +1410,10 @@ const pullAudioFlow = async (playerId, operation, streamid) => {
  const setFocusStreams = (bFocus, streamIdarr) => {
   return callMethod('SetFocusStreams', {bFocus, streamId1, streamId1, streamId1, streamId1});
 }
+//加载采集插件的输入数据
+export const loadCollectionInputEntry = () => {
+  return callMethod('LoadCollectionInputEntry', {});
+};
 
 //加载截屏插件
 const LoadCollectionOutputEntry2 = () => {

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 设备检测初始化
@@ -516,7 +521,11 @@ export const stopPushFlow = (idx, streamId) => {
  */
 export const initPullFlow = (args) => {
   switch (window.zbyAVSDK_init_sdk_type) {
-  case RTC:
+    case RTC:
+    //判断是否是M1设备
+    if (window.zby_isM1Type) {
+      return;
+    }
     return {
       sdk_type: RTC,
       videoSrc: rtcsdk.initPullFlow(args.streamId, args.domId, args.mute, args.renderId, args.notAutoPlay, args.audioOnly, args.needScale, args.scaleParams, args.streamType)
@@ -1803,6 +1812,11 @@ export const getStreamType_zego = () => {
   }
 };
 
+const setThirdAudioCallbackType = (sdkType) => {
+  let type = sdkVale[sdkType];
+  return zegosdk.setThirdAudioType(type);
+}
+
 
 export default {
   init,
@@ -1881,6 +1895,7 @@ export default {
   sendMediaSideInfo,
   enableHighlight,
   setAUXAudioType,
-  mixedstuVideo
+  mixedstuVideo,
+  setThirdAudioCallbackType
   // getDeviceState
 };

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

@@ -2410,7 +2410,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 +2425,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 +2991,6 @@ export default {
   addListener,
   stopCheckDevice,
   getDeviceCheckInitStatus,
-  setDeviceCheckInitStatus
+  setDeviceCheckInitStatus,
+  setThirdAudioType
 };

package/src/zby-live-sdk.js

@@ -21,7 +21,7 @@ import {
 import toolBaseApi from './tool/base';
 import liveBaseApi from './live/base';
 import defaultApi from './default';
-import {getDevicePermissionsFun, setMediaPermissionFun} from './zby-av-sdk/device';
+import {getDevicePermissionsFun, setMediaPermissionFun, isAppleM1} from './zby-av-sdk/device';
 import NOTICE from './notice';
 
 // window.zegoHasPushFlow = 0
@@ -380,6 +380,13 @@ const zbysdk = {
       defaultApi.writeLog(`sdk init AVSDK init_failed ${JSON.stringify(error)}`);
       return;
     });
+    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)}`);
+    }; 
     try {
       // dataReport.joinRoom({initParams: JSON.stringify(args)});
       dataReport.joinRoom({initParams: args});
@@ -390,6 +397,11 @@ const zbysdk = {
       sdk_type,
       status: 'init_finished'
     });
+    try {
+      window.zby_isM1Type =(await isAppleM1()).data.is_Apple_Silicon;
+    } catch (error) {
+      defaultApi.writeLog(`sdk action : isAppleM1 error ${JSON.stringify(error)}`);
+    }
     try{
       dataReport.initFinished({code:0});
     }catch (e){ }
@@ -563,6 +575,14 @@ const zbysdk = {
         window.target_sdk_type = null;
       }
 
+      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)}`);
+      }
+
       try {
         dataReport.sdkChange({
           from: nowSdk,