zby-live-sdk 1.0.49-beta-talrtc0922 → 1.0.49-beta-talrtc1014

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta-talrtc0922",
+  "version": "1.0.49-beta-talrtc1014",
   "main": "dist/zby-live-sdk.cjs.js",
   "module": "dist/zby-live-sdk.esm.js",
   "browsers": "dist/zby-live-sdk.umd.js",

package/src/channel/getSendMsgParams.js

@@ -1,66 +1,66 @@
-import util from '../util/util';
-
-function getParams(baseInfo) {
-  const {userId, target, userName, role, roomId, institutionId} = baseInfo;
-  return {
-    appId: institutionId,
-    actorId: userId,
-    actorName: userName,
-    actorType: role,
-    roomId,
-    streamUrl: util.getStreamId(baseInfo),
-    streamService: window.zbyAVSDK_init_sdk_type,
-    version: 1,
-    target
-  };
-};
-
-export default {
-  sendJoinAck(baseInfo) {
-    const data = {
-      'api':'joinAck',
-      ...getParams(baseInfo)
-    };
-    //无target代表广播消息，target代表有定向发送消息
-    return data;
-  },
-  sendAddStream(baseInfo) {
-    const data = {
-      'api': 'addStream',
-      'playMode': '2', //播放流的模式，1全屏播放，2在其视频区正常播放3.只播放音频不播放视频
-      ...getParams(baseInfo)
-    };
-    return data;
-  },
-  sendUpdateStreamDeviceStatus(baseInfo) {
-    const {deviceType, deviceStatus} = baseInfo;
-    const data ={
-      'api':'updateStreamDeviceStatus',
-      'streamType': deviceType, // string 流设备对应类型：1：视频 2：音频 3：音视频 4：截屏 5：截屏+视频 6：截屏+音频
-      'status': deviceStatus,   // string 流设备状态 1开启 2关闭 3未找到
-      ...getParams(baseInfo)
-    };
-    return data;
-  },
-  sendRemoveStream(baseInfo) {
-    let data = {
-      'api':'removeStream',
-      ...getParams(baseInfo)
-    };
-    return data;
-  },
-  sendJoin(baseInfo) {
-    const data = {
-      'api':'join',
-      ...getParams(baseInfo)
-    };
-    return data;
-  },
-  sendLeave(baseInfo) {
-    const data = {
-      'api':'leave',
-      ...getParams(baseInfo)
-    };
-    return data;
-  }
-};
+import util from '../util/util';
+
+function getParams(baseInfo) {
+  const {userId, target, userName, role, roomId, institutionId} = baseInfo;
+  return {
+    appId: institutionId,
+    actorId: userId,
+    actorName: userName,
+    actorType: role,
+    roomId,
+    streamUrl: util.getStreamId(baseInfo),
+    streamService: window.zbyAVSDK_init_sdk_type,
+    version: 1,
+    target
+  };
+};
+
+export default {
+  sendJoinAck(baseInfo) {
+    const data = {
+      'api':'joinAck',
+      ...getParams(baseInfo)
+    };
+    //无target代表广播消息，target代表有定向发送消息
+    return data;
+  },
+  sendAddStream(baseInfo) {
+    const data = {
+      'api': 'addStream',
+      'playMode': '2', //播放流的模式，1全屏播放，2在其视频区正常播放3.只播放音频不播放视频
+      ...getParams(baseInfo)
+    };
+    return data;
+  },
+  sendUpdateStreamDeviceStatus(baseInfo) {
+    const {deviceType, deviceStatus} = baseInfo;
+    const data ={
+      'api':'updateStreamDeviceStatus',
+      'streamType': deviceType, // string 流设备对应类型：1：视频 2：音频 3：音视频 4：截屏 5：截屏+视频 6：截屏+音频
+      'status': deviceStatus,   // string 流设备状态 1开启 2关闭 3未找到
+      ...getParams(baseInfo)
+    };
+    return data;
+  },
+  sendRemoveStream(baseInfo) {
+    let data = {
+      'api':'removeStream',
+      ...getParams(baseInfo)
+    };
+    return data;
+  },
+  sendJoin(baseInfo) {
+    const data = {
+      'api':'join',
+      ...getParams(baseInfo)
+    };
+    return data;
+  },
+  sendLeave(baseInfo) {
+    const data = {
+      'api':'leave',
+      ...getParams(baseInfo)
+    };
+    return data;
+  }
+};

package/src/channel/index.js

@@ -1,138 +1,138 @@
-import zbyChannelObj from './zby';
-import pomeloChannelObj from './pomelo';
-import getSendMsgParams from './getSendMsgParams';
-import dict from '../util/dict';
-import defaultApi from '../default';
-import {
-  userAndDeviceStatusInfo
-} from '../zby-live-sdk.js';
-import {
-  getCloudData
-} from '../network/api';
-import zbysdk from '../zby-live-sdk';
-
-const channelObjs = {
-  1: zbyChannelObj,
-  2: pomeloChannelObj
-};
-
-let channelObj = null;
-
-class ChannelClient {
-  constructor() {
-    this.initParams = null;
-  }
-  // 加入房间
-  /**
-   *
-   * @param {object} params
-   * @param {string} params.userId 用户id
-   * @param {string} params.roomId 房间id
-   * @param {string} params.host 信道链接地址
-   * @param {string} params.userName 用户名
-   * @param {string} params.role 角色 teacher/student/assitant
-   * @param {string} params.institutionId 机构
-   * @param {function} cb 回调函数
-   * @param {number} channelType 信道类型 1=直播云信道 2=pomelo
-   */
-  async joinRoom(params, cb, channelType = 1) {
-    // 设置初始化参数
-    this.initParams = params;
-    // 设置当前信道对象,使用直播云还是pomelo
-    channelObj = channelObjs[channelType];
-    defaultApi.writeLog('channel_log : choose channel and start joining ......');
-    // 加入房间
-    channelObj.joinRoom(params, cb);
-    this.sendJoin(params);
-  }
-  // 离开房间
-  async leaveRoom() {
-    if (!channelObj) {
-      console.log('channel has not init');
-      defaultApi.writeLog('channel has not init');
-      return;
-    }
-    // 离开房间
-    channelObj.leaveRoom();
-  }
-  // 发送信道消息
-  sendChannelMsg(msg) {
-    if (!channelObj) {
-      console.log('channel has not init');
-      defaultApi.writeLog('channel has not init');
-      return;
-    }
-    channelObj.sendChannelMsg(msg);
-  }
-  // 发送进房消息，是自己加入房间群发的消息
-  sendJoin(args) {
-    this.sendChannelMsg(getSendMsgParams.sendJoin(args));
-  }
-  // 发送离开房间消息，是收到别人进入房间然后定向发的消息
-  sendLeave(args) {
-    this.sendChannelMsg(getSendMsgParams.sendLeave(args));
-  }
-  // 发送进房ack消息
-  sendJoinAck(args) {
-    this.sendChannelMsg(getSendMsgParams.sendJoinAck(args));
-  }
-  // 发送推流消息，addstream自己推流成功会发，如果有个人进来你会单独给他发，没有ack
-  sendAddStream(args) {
-    this.sendChannelMsg(getSendMsgParams.sendAddStream(args));
-  }
-  // 发送设备状态更新消息
-  sendUpdateStreamDeviceStatus(args) {
-    this.sendChannelMsg(getSendMsgParams.sendUpdateStreamDeviceStatus(args));
-  }
-  // 发送停止推流消息
-  sendRemoveStream(args) {
-    this.sendChannelMsg(getSendMsgParams.sendRemoveStream(args));
-  }
-  //断线重连时，加入小组
-  async reJoin() {
-    //获取当前小组sdk类型
-    const cloudResponse = await getCloudData(window.zby_sdk_req_get_cloud_params);
-    const new_target_sdk_type = cloudResponse.data.sdkName;
-
-    if (window.target_sdk_type) {
-      //正在切换中，等待切换
-      defaultApi.writeLog('reJoin changing -- wait_changed');
-      return;
-    } else if (!window.target_sdk_type && window.current_sdk_type !== new_target_sdk_type) {
-      //未在切换中，且当前SDK类型和小组不一致:进行切换SDK
-      console.log('info', `断线重连，准备执行切换 SDK to ${new_target_sdk_type}`);
-      defaultApi.writeLog(`reJoin : 断线重连，准备执行切换 SDK to ${new_target_sdk_type}`);
-      zbysdk.changeSDK(1);
-    } else {
-      const {roomId, userId, userName, institutionId, role} = this.initParams;
-      //一致：重进
-      defaultApi.writeLog('reJoin : SDK一致, 重进');
-      const baseInfo = {
-        roomId,
-        userId,
-        userName,
-        institutionId,
-        role
-      };
-      this.sendJoin(baseInfo);
-      this.sendAddStream(baseInfo);
-      this.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
-        deviceType: dict.getDeviceTypeKey('video'),
-        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.camera ? 'open' : 'closed'),
-      }));
-      this.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
-        deviceType: dict.getDeviceTypeKey('audio'),
-        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.microPhone ? 'open' : 'closed'),
-      }));
-    }
-  }
-}
-
-const channelClient =  new ChannelClient();
-
-
-
-
-
-export default channelClient;
-
+import zbyChannelObj from './zby';
+import pomeloChannelObj from './pomelo';
+import getSendMsgParams from './getSendMsgParams';
+import dict from '../util/dict';
+import defaultApi from '../default';
+import {
+  userAndDeviceStatusInfo
+} from '../zby-live-sdk.js';
+import {
+  getCloudData
+} from '../network/api';
+import zbysdk from '../zby-live-sdk';
+
+const channelObjs = {
+  1: zbyChannelObj,
+  2: pomeloChannelObj
+};
+
+let channelObj = null;
+
+class ChannelClient {
+  constructor() {
+    this.initParams = null;
+  }
+  // 加入房间
+  /**
+   *
+   * @param {object} params
+   * @param {string} params.userId 用户id
+   * @param {string} params.roomId 房间id
+   * @param {string} params.host 信道链接地址
+   * @param {string} params.userName 用户名
+   * @param {string} params.role 角色 teacher/student/assitant
+   * @param {string} params.institutionId 机构
+   * @param {function} cb 回调函数
+   * @param {number} channelType 信道类型 1=直播云信道 2=pomelo
+   */
+  async joinRoom(params, cb, channelType = 1) {
+    // 设置初始化参数
+    this.initParams = params;
+    // 设置当前信道对象,使用直播云还是pomelo
+    channelObj = channelObjs[channelType];
+    defaultApi.writeLog('channel_log : choose channel and start joining ......');
+    // 加入房间
+    channelObj.joinRoom(params, cb);
+    this.sendJoin(params);
+  }
+  // 离开房间
+  async leaveRoom() {
+    if (!channelObj) {
+      console.log('channel has not init');
+      defaultApi.writeLog('channel has not init');
+      return;
+    }
+    // 离开房间
+    channelObj.leaveRoom();
+  }
+  // 发送信道消息
+  sendChannelMsg(msg) {
+    if (!channelObj) {
+      console.log('channel has not init');
+      defaultApi.writeLog('channel has not init');
+      return;
+    }
+    channelObj.sendChannelMsg(msg);
+  }
+  // 发送进房消息，是自己加入房间群发的消息
+  sendJoin(args) {
+    this.sendChannelMsg(getSendMsgParams.sendJoin(args));
+  }
+  // 发送离开房间消息，是收到别人进入房间然后定向发的消息
+  sendLeave(args) {
+    this.sendChannelMsg(getSendMsgParams.sendLeave(args));
+  }
+  // 发送进房ack消息
+  sendJoinAck(args) {
+    this.sendChannelMsg(getSendMsgParams.sendJoinAck(args));
+  }
+  // 发送推流消息，addstream自己推流成功会发，如果有个人进来你会单独给他发，没有ack
+  sendAddStream(args) {
+    this.sendChannelMsg(getSendMsgParams.sendAddStream(args));
+  }
+  // 发送设备状态更新消息
+  sendUpdateStreamDeviceStatus(args) {
+    this.sendChannelMsg(getSendMsgParams.sendUpdateStreamDeviceStatus(args));
+  }
+  // 发送停止推流消息
+  sendRemoveStream(args) {
+    this.sendChannelMsg(getSendMsgParams.sendRemoveStream(args));
+  }
+  //断线重连时，加入小组
+  async reJoin() {
+    //获取当前小组sdk类型
+    const cloudResponse = await getCloudData(window.zby_sdk_req_get_cloud_params);
+    const new_target_sdk_type = cloudResponse.data.sdkName;
+
+    if (window.target_sdk_type) {
+      //正在切换中，等待切换
+      defaultApi.writeLog('reJoin changing -- wait_changed');
+      return;
+    } else if (!window.target_sdk_type && window.current_sdk_type !== new_target_sdk_type) {
+      //未在切换中，且当前SDK类型和小组不一致:进行切换SDK
+      console.log('info', `断线重连，准备执行切换 SDK to ${new_target_sdk_type}`);
+      defaultApi.writeLog(`reJoin : 断线重连，准备执行切换 SDK to ${new_target_sdk_type}`);
+      zbysdk.changeSDK(1);
+    } else {
+      const {roomId, userId, userName, institutionId, role} = this.initParams;
+      //一致：重进
+      defaultApi.writeLog('reJoin : SDK一致, 重进');
+      const baseInfo = {
+        roomId,
+        userId,
+        userName,
+        institutionId,
+        role
+      };
+      this.sendJoin(baseInfo);
+      this.sendAddStream(baseInfo);
+      this.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
+        deviceType: dict.getDeviceTypeKey('video'),
+        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.camera ? 'open' : 'closed'),
+      }));
+      this.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
+        deviceType: dict.getDeviceTypeKey('audio'),
+        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.microPhone ? 'open' : 'closed'),
+      }));
+    }
+  }
+}
+
+const channelClient =  new ChannelClient();
+
+
+
+
+
+export default channelClient;
+