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

package/src/channel/pomelo/util.js

@@ -1,54 +1,54 @@
-import pako from 'pako';
-export default {
-  translateRole(role, roleNum) {
-    const roleArr = ['student', 'assist', 'teacher'];
-    const roleNumArr = ['1', '2', '4'];
-    if (roleArr.includes(role)) {
-      return roleNumArr[roleArr.indexOf(role)];
-    }
-    if (roleNumArr.includes(roleNum)) {
-      return roleArr[roleNumArr.indexOf(roleNum)];
-    }
-  },
-  /**
-   * 压缩 / 解压 json
-   */
-  zip(data) {
-    if (data) {
-      const str = JSON.stringify(data);
-      const binaryString = pako.gzip(encodeURIComponent(str), {
-        to: 'string'
-      });
-      return btoa(binaryString);
-    }
-  },
-  unzip(b64Data) {
-    let strData = atob(b64Data);
-    // Convert binary string to character-number array
-    const charData = strData.split('').map(function (x) {
-      return x.charCodeAt(0);
-    });
-    // Turn number array into byte-array
-    const binData = new Uint8Array(charData);
-    // // unzip
-    //   const data = pako.inflate(binData)
-    const data = pako.inflate(binData, {to: 'string'});
-    // Convert gunzipped byteArray back to ascii string:
-    //   strData = arrayBufferToString(data)
-    return decodeURIComponent(data);
-  },
-  arrayBufferToString(buffer) {
-    const bufView = new Uint16Array(buffer);
-    const length = bufView.length;
-    let result = '';
-    let addition = Math.pow(2, 16) - 1;
-
-    for (var i = 0; i < length; i += addition) {
-      if (i + addition > length) {
-        addition = length - i;
-      }
-      result += String.fromCharCode.apply(null, bufView.subarray(i, i + addition));
-    }
-    return result;
-  }
-};
+import pako from 'pako';
+export default {
+  translateRole(role, roleNum) {
+    const roleArr = ['student', 'assist', 'teacher'];
+    const roleNumArr = ['1', '2', '4'];
+    if (roleArr.includes(role)) {
+      return roleNumArr[roleArr.indexOf(role)];
+    }
+    if (roleNumArr.includes(roleNum)) {
+      return roleArr[roleNumArr.indexOf(roleNum)];
+    }
+  },
+  /**
+   * 压缩 / 解压 json
+   */
+  zip(data) {
+    if (data) {
+      const str = JSON.stringify(data);
+      const binaryString = pako.gzip(encodeURIComponent(str), {
+        to: 'string'
+      });
+      return btoa(binaryString);
+    }
+  },
+  unzip(b64Data) {
+    let strData = atob(b64Data);
+    // Convert binary string to character-number array
+    const charData = strData.split('').map(function (x) {
+      return x.charCodeAt(0);
+    });
+    // Turn number array into byte-array
+    const binData = new Uint8Array(charData);
+    // // unzip
+    //   const data = pako.inflate(binData)
+    const data = pako.inflate(binData, {to: 'string'});
+    // Convert gunzipped byteArray back to ascii string:
+    //   strData = arrayBufferToString(data)
+    return decodeURIComponent(data);
+  },
+  arrayBufferToString(buffer) {
+    const bufView = new Uint16Array(buffer);
+    const length = bufView.length;
+    let result = '';
+    let addition = Math.pow(2, 16) - 1;
+
+    for (var i = 0; i < length; i += addition) {
+      if (i + addition > length) {
+        addition = length - i;
+      }
+      result += String.fromCharCode.apply(null, bufView.subarray(i, i + addition));
+    }
+    return result;
+  }
+};

package/src/channel/sdk-cb.js

@@ -1,73 +1,73 @@
-/*
- * @Author: your name
- * @Date: 2021-01-05 20:41:36
- * @LastEditTime: 2021-03-25 21:57:42
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \1223\xbase_extension_zby_live_sdk\src\channel\sdk-cb.js
- */
-import NOTICE from '../notice';
-import dict from '../util/dict';
-
-const sdkCb = {
-  join(data) {
-    NOTICE.join({
-      userId: data.userid || data.actorId,
-      userName: data.actorName,
-      role: data.actorType || data.role
-    });
-  },
-  joinAck(data) {
-    NOTICE.joinAck({
-      userId: data.userid || data.actorId,
-      userName: data.actorName,
-      role: data.actorType || data.role
-    });
-  },
-  addStream(data) {
-    NOTICE.addStream({
-      userId: data.userid || data.actorId,
-      userName: data.actorName,
-      role: data.actorType || data.role,
-      streamId: data.streamUrl,
-      videoSrc: ''
-    });
-  },
-  removeStream(data) {
-    NOTICE.removeStream({
-      userId: data.userid || data.actorId|| data.streamUrl.split('_')[2],
-      userName: data.actorName,
-      role: data.actorType || data.role,
-      streamId: data.streamUrl
-    });
-  },
-  updateStreamDeviceStatus(data) {
-    NOTICE.updateStreamDeviceStatus({
-      userId: data.userid || data.actorId,
-      userName: data.actorName,
-      role: data.actorType || data.role,
-      //获取设备类型和状态对应的文案，返回给业务层
-      deviceType: dict.devicesMap.get(parseInt(data.streamType)),
-      deviceStatus: dict.devicesStatusMap.get(parseInt(data.status))
-    });
-  },
-  leave(data) {
-    NOTICE.leave({
-      userId: data.userid || data.actorId,
-      userName: data.actorName,
-      role: data.actorType || data.role
-    });
-  },
-  channelDisconnect() {
-    NOTICE.channelDisconnect();
-  },
-  userDisconnect(data) {
-    NOTICE.userDisconnect({
-      userId: data.userid || data.actorId,
-      userName: data.username,
-      role: data.role
-    });
-  }
-};
-
-export default sdkCb;
+/*
+ * @Author: your name
+ * @Date: 2021-01-05 20:41:36
+ * @LastEditTime: 2021-03-25 21:57:42
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \1223\xbase_extension_zby_live_sdk\src\channel\sdk-cb.js
+ */
+import NOTICE from '../notice';
+import dict from '../util/dict';
+
+const sdkCb = {
+  join(data) {
+    NOTICE.join({
+      userId: data.userid || data.actorId,
+      userName: data.actorName,
+      role: data.actorType || data.role
+    });
+  },
+  joinAck(data) {
+    NOTICE.joinAck({
+      userId: data.userid || data.actorId,
+      userName: data.actorName,
+      role: data.actorType || data.role
+    });
+  },
+  addStream(data) {
+    NOTICE.addStream({
+      userId: data.userid || data.actorId,
+      userName: data.actorName,
+      role: data.actorType || data.role,
+      streamId: data.streamUrl,
+      videoSrc: ''
+    });
+  },
+  removeStream(data) {
+    NOTICE.removeStream({
+      userId: data.userid || data.actorId|| data.streamUrl.split('_')[2],
+      userName: data.actorName,
+      role: data.actorType || data.role,
+      streamId: data.streamUrl
+    });
+  },
+  updateStreamDeviceStatus(data) {
+    NOTICE.updateStreamDeviceStatus({
+      userId: data.userid || data.actorId,
+      userName: data.actorName,
+      role: data.actorType || data.role,
+      //获取设备类型和状态对应的文案，返回给业务层
+      deviceType: dict.devicesMap.get(parseInt(data.streamType)),
+      deviceStatus: dict.devicesStatusMap.get(parseInt(data.status))
+    });
+  },
+  leave(data) {
+    NOTICE.leave({
+      userId: data.userid || data.actorId,
+      userName: data.actorName,
+      role: data.actorType || data.role
+    });
+  },
+  channelDisconnect() {
+    NOTICE.channelDisconnect();
+  },
+  userDisconnect(data) {
+    NOTICE.userDisconnect({
+      userId: data.userid || data.actorId,
+      userName: data.username,
+      role: data.role
+    });
+  }
+};
+
+export default sdkCb;

package/src/channel/stream-msg.js

@@ -1,97 +1,97 @@
-import dict from '../util/dict';
-import CHANNEL from './index';
-import defaultApi from '../default';
-import sdkCb from './sdk-cb';
-import {
-  userAndDeviceStatusInfo
-} from '../zby-live-sdk';
-import dataReport from '../network/dataReport';
-
-
-
-export default function(data, baseInfo) {
-  try {
-    dataReport.pomeloRecvMsg({data});
-  } catch(e) {
-    console.log('pomeloRecvMsg_error',e);
-  }
-  switch (data.api) {
-  case 'join':
-    //通知业务层信息：有人进入房间
-    sdkCb.join(data);
-    defaultApi.writeLog(`sdk notice user_join role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
-    //如果本地是学生，就定向回应joinAck和addStream，让对方可以展示自己的视频
-    //定向回应joinAck和addStream，让对方可以展示自己的视频
-    //线路切换:本地学生和老师SDK类型不一致
-    if (window.target_sdk_type) {
-      //存在target_sdk_type ，表示正在切换中，等待切换
-      defaultApi.writeLog(`changing sdk to ${window.target_sdk_type},ignore remote userId ${data.actorId} join msg`);
-      break;
-    } else {
-      CHANNEL.sendJoinAck(baseInfo);
-      CHANNEL.sendAddStream(baseInfo);
-      CHANNEL.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
-        deviceType: dict.getDeviceTypeKey('video'),
-        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.camera ? 'open' : 'closed'),
-      }));
-      CHANNEL.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
-        deviceType: dict.getDeviceTypeKey('audio'),
-        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.microPhone ? 'open' : 'closed'),
-      }));
-    }
-    break;
-
-  case 'joinAck':
-    //首先确认对方的消息是针对本人进行回应的（信道处理）定向接收
-    //通知业务层信息：有人在房间的回应
-    sdkCb.joinAck(data);
-    defaultApi.writeLog(`sdk notice user_response role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
-    break;
-
-  case 'addStream':
-    defaultApi.writeLog({
-      changing_sdk_type: window.target_sdk_type,
-      local_sdk_type: window.current_sdk_type,
-      remote_sdk_type: data.sdkName,
-      isIgnore: !!window.target_sdk_type ||
-          (data.sdkName &&
-            (window.current_sdk_type !== data.sdkName))
-    });
-    if (!!window.target_sdk_type ||
-        (data.sdkName && (window.current_sdk_type !== data.sdkName))) {
-      defaultApi.writeLog(`recv different sdk addStream,:target ${window.target_sdk_type},ignore remote userId ${data.actorId} msg`);
-      break;
-    }
-    //处理接收的群发消息和定向消息(已经由消息服务器处理过)
-    //通知展示收到的视频流数据
-    sdkCb.addStream(data);
-    defaultApi.writeLog(`sdk notice remote_video_ready : current_sdk_type: ${window.current_sdk_type}, zbyAVSDK_type: ${window.zbyAVSDK_init_sdk_type},  role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
-    break;
-  case 'removeStream':
-    if (data.sdkName && (window.current_sdk_type !== data.sdkName)) {
-      break;
-    }
-    //处理接收的群发removeStream消息
-    //通知移除收到的视频流数据
-    sdkCb.removeStream(data);
-    defaultApi.writeLog(`sdk notice remote_video_removed ,streamUrl ${data.streamUrl}, role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName} `);
-    break;
-  case 'updateStreamDeviceStatus':
-    /**
-       * @data.streamType: 1视频 / 2麦克风
-       * @data.status: 1打开 / 2关闭
-       * @CONTROL.role: '1' 老师收流 / '2' 学生收流
-       * */
-    //通知业务层信息
-    sdkCb.updateStreamDeviceStatus(data);
-    defaultApi.writeLog(`sdk notice device_status role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName} deviceType : ${dict.devicesMap.get(parseInt(data.streamType))} deviceStatus: ${dict.devicesStatusMap.get(parseInt(data.status))}`);
-    break;
-  case 'leave':
-    //通知业务层信息
-    sdkCb.leave(data);
-    defaultApi.writeLog(`sdk notice user_leave role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
-    break;
-  default:
-    break;
-  }
-}
+import dict from '../util/dict';
+import CHANNEL from './index';
+import defaultApi from '../default';
+import sdkCb from './sdk-cb';
+import {
+  userAndDeviceStatusInfo
+} from '../zby-live-sdk';
+import dataReport from '../network/dataReport';
+
+
+
+export default function(data, baseInfo) {
+  try {
+    dataReport.pomeloRecvMsg({data});
+  } catch(e) {
+    console.log('pomeloRecvMsg_error',e);
+  }
+  switch (data.api) {
+  case 'join':
+    //通知业务层信息：有人进入房间
+    sdkCb.join(data);
+    defaultApi.writeLog(`sdk notice user_join role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
+    //如果本地是学生，就定向回应joinAck和addStream，让对方可以展示自己的视频
+    //定向回应joinAck和addStream，让对方可以展示自己的视频
+    //线路切换:本地学生和老师SDK类型不一致
+    if (window.target_sdk_type) {
+      //存在target_sdk_type ，表示正在切换中，等待切换
+      defaultApi.writeLog(`changing sdk to ${window.target_sdk_type},ignore remote userId ${data.actorId} join msg`);
+      break;
+    } else {
+      CHANNEL.sendJoinAck(baseInfo);
+      CHANNEL.sendAddStream(baseInfo);
+      CHANNEL.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
+        deviceType: dict.getDeviceTypeKey('video'),
+        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.camera ? 'open' : 'closed'),
+      }));
+      CHANNEL.sendUpdateStreamDeviceStatus(Object.assign({}, baseInfo, {
+        deviceType: dict.getDeviceTypeKey('audio'),
+        deviceStatus: dict.getDeviceStatusKey(userAndDeviceStatusInfo && userAndDeviceStatusInfo.microPhone ? 'open' : 'closed'),
+      }));
+    }
+    break;
+
+  case 'joinAck':
+    //首先确认对方的消息是针对本人进行回应的（信道处理）定向接收
+    //通知业务层信息：有人在房间的回应
+    sdkCb.joinAck(data);
+    defaultApi.writeLog(`sdk notice user_response role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
+    break;
+
+  case 'addStream':
+    defaultApi.writeLog({
+      changing_sdk_type: window.target_sdk_type,
+      local_sdk_type: window.current_sdk_type,
+      remote_sdk_type: data.sdkName,
+      isIgnore: !!window.target_sdk_type ||
+          (data.sdkName &&
+            (window.current_sdk_type !== data.sdkName))
+    });
+    if (!!window.target_sdk_type ||
+        (data.sdkName && (window.current_sdk_type !== data.sdkName))) {
+      defaultApi.writeLog(`recv different sdk addStream,:target ${window.target_sdk_type},ignore remote userId ${data.actorId} msg`);
+      break;
+    }
+    //处理接收的群发消息和定向消息(已经由消息服务器处理过)
+    //通知展示收到的视频流数据
+    sdkCb.addStream(data);
+    defaultApi.writeLog(`sdk notice remote_video_ready : current_sdk_type: ${window.current_sdk_type}, zbyAVSDK_type: ${window.zbyAVSDK_init_sdk_type},  role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
+    break;
+  case 'removeStream':
+    if (data.sdkName && (window.current_sdk_type !== data.sdkName)) {
+      break;
+    }
+    //处理接收的群发removeStream消息
+    //通知移除收到的视频流数据
+    sdkCb.removeStream(data);
+    defaultApi.writeLog(`sdk notice remote_video_removed ,streamUrl ${data.streamUrl}, role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName} `);
+    break;
+  case 'updateStreamDeviceStatus':
+    /**
+       * @data.streamType: 1视频 / 2麦克风
+       * @data.status: 1打开 / 2关闭
+       * @CONTROL.role: '1' 老师收流 / '2' 学生收流
+       * */
+    //通知业务层信息
+    sdkCb.updateStreamDeviceStatus(data);
+    defaultApi.writeLog(`sdk notice device_status role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName} deviceType : ${dict.devicesMap.get(parseInt(data.streamType))} deviceStatus: ${dict.devicesStatusMap.get(parseInt(data.status))}`);
+    break;
+  case 'leave':
+    //通知业务层信息
+    sdkCb.leave(data);
+    defaultApi.writeLog(`sdk notice user_leave role: ${data.actorType} userId : ${data.actorId} userName: ${data.actorName}`);
+    break;
+  default:
+    break;
+  }
+}

package/src/channel/zby/index.js

@@ -1,74 +1,74 @@
-/*
- * @Author: your name
- * @Date: 2020-12-03 16:07:40
- * @LastEditTime: 2020-12-10 21:25:24
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \xiaoban_report\xbase_extension_51_demo\src\_zby_live_sdk\src\channel\zby\index.js
- */
-import interactWithChannel from './interactWithChannel';
-import CHANNEL from '../index';
-import util from '../../util/util';
-import {getApiCloudBaseUrl} from '../../config/config';
-
-function sendChannelMsgInner(data) {
-  const target = data.target;
-  if(target) {
-    delete data.target;
-    interactWithChannel.control.sendStreamMsg('stream', JSON.stringify(data), target);
-  } else {
-    interactWithChannel.control.sendStreamMsg('stream', JSON.stringify(data));
-  }
-}
-
-export default {
-  joinRoom(args, cb) {
-    try {
-      //设置信道基础参数
-      interactWithChannel.entry.setConfigInfo(JSON.stringify({
-        'address': args.chatUrl,
-        'user': {
-          'userid': args.userId,
-          'username': args.userName || '',
-          'token': args.channelToken,
-          'role': args.role,
-          'avatar': '',
-          'code': '1234',
-        },
-        'language': 0,
-        'logmode': 0,
-        'channeltype': 1,
-      }));
-    } catch (error) {
-      window.zby_sdk_init_status_for_data_report = false;
-      try {
-        dataReport.joinRoomResult({
-          code: '2',
-          // cloud_api_response: JSON.stringify(window.zby_sdk_cloud_data),
-          cloud_api_response: window.zby_sdk_cloud_data,
-          cloud_api_url: `${getApiCloudBaseUrl()}/rtccloud/class/init`,
-          chat_url: args.chatUrl
-        });
-      } catch (e) {};
-    }
-
-    interactWithChannel.entry.enterRoom(JSON.stringify({
-      //向老客户端兼容，拼接institutionId，信道进房间使用拼接后的roomid
-      'roomid': util.getConfId(args.institutionId, args.roomId),
-      'classmode': 4,
-      'playmode': 1, //1=正常上课；2=回放
-      'institutionid': args.institutionId,
-      //51连接信道所需，区分连接来源
-      'conn_origin': '51plan'
-    }), cb);
-    CHANNEL.sendJoin(args);
-  },
-  leaveRoom() {
-    interactWithChannel.entry.leaveRoom();
-  },
-  sendChannelMsg(data, target) {
-    util.waitFlagToRun(() => {
-      return interactWithChannel.control.isInRoom;
-    }, sendChannelMsgInner, {...data, target});
-  },
-};
+/*
+ * @Author: your name
+ * @Date: 2020-12-03 16:07:40
+ * @LastEditTime: 2020-12-10 21:25:24
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \xiaoban_report\xbase_extension_51_demo\src\_zby_live_sdk\src\channel\zby\index.js
+ */
+import interactWithChannel from './interactWithChannel';
+import CHANNEL from '../index';
+import util from '../../util/util';
+import {getApiCloudBaseUrl} from '../../config/config';
+
+function sendChannelMsgInner(data) {
+  const target = data.target;
+  if(target) {
+    delete data.target;
+    interactWithChannel.control.sendStreamMsg('stream', JSON.stringify(data), target);
+  } else {
+    interactWithChannel.control.sendStreamMsg('stream', JSON.stringify(data));
+  }
+}
+
+export default {
+  joinRoom(args, cb) {
+    try {
+      //设置信道基础参数
+      interactWithChannel.entry.setConfigInfo(JSON.stringify({
+        'address': args.chatUrl,
+        'user': {
+          'userid': args.userId,
+          'username': args.userName || '',
+          'token': args.channelToken,
+          'role': args.role,
+          'avatar': '',
+          'code': '1234',
+        },
+        'language': 0,
+        'logmode': 0,
+        'channeltype': 1,
+      }));
+    } catch (error) {
+      window.zby_sdk_init_status_for_data_report = false;
+      try {
+        dataReport.joinRoomResult({
+          code: '2',
+          // cloud_api_response: JSON.stringify(window.zby_sdk_cloud_data),
+          cloud_api_response: window.zby_sdk_cloud_data,
+          cloud_api_url: `${getApiCloudBaseUrl()}/rtccloud/class/init`,
+          chat_url: args.chatUrl
+        });
+      } catch (e) {};
+    }
+
+    interactWithChannel.entry.enterRoom(JSON.stringify({
+      //向老客户端兼容，拼接institutionId，信道进房间使用拼接后的roomid
+      'roomid': util.getConfId(args.institutionId, args.roomId),
+      'classmode': 4,
+      'playmode': 1, //1=正常上课；2=回放
+      'institutionid': args.institutionId,
+      //51连接信道所需，区分连接来源
+      'conn_origin': '51plan'
+    }), cb);
+    CHANNEL.sendJoin(args);
+  },
+  leaveRoom() {
+    interactWithChannel.entry.leaveRoom();
+  },
+  sendChannelMsg(data, target) {
+    util.waitFlagToRun(() => {
+      return interactWithChannel.control.isInRoom;
+    }, sendChannelMsgInner, {...data, target});
+  },
+};

package/src/channel/zby/interactWithChannel.js

@@ -1,4 +1,4 @@
-import control from './interactWithChannelControl.js';
-import entry from './interactWithChannelEntry';
-
-export default { control, entry };
+import control from './interactWithChannelControl.js';
+import entry from './interactWithChannelEntry';
+
+export default { control, entry };