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

package/src/tool/base.js

@@ -1,74 +1,74 @@
-/*
- * @Author: why
- * @Date: 2019-08-08 19:33:44
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-24 16:47:40
- * @Description:
- */
-import {toolExt, liveExt} from '../config/config';
-import callMethod from './call-method';
-const EM = window.EM;
-export default {
-  // 获取本地CPU内存占比
-  getCurCpuMemInfo: () => {
-    return callMethod('GetCurCpuMemInfo', null, 'getCurCpuMemInfo');
-  },
-
-  // ping给定的拉流url，调取一次ping30s后返回延迟及丢包信息抛出事件
-  startLossDelayPing: (args) => {
-    return callMethod('GetLossDelayInfo', args, 'startLossDelayPing');
-  },
-
-  // ping给定的拉流url，调取一次ping30s后返回延迟及丢包信息抛出事件
-  startSocialLossDelayPing: (args) => {
-    return callMethod('GetSocialLossDelayInfo', args, 'startSocialLossDelayPing');
-  },
-  // 获取上报公共字段信息
-  getCommonData() {
-    return callMethod('GetCommonData', {live_ext_ver: liveExt.version}, 'getCommonData');
-  },
-  // 打开一个路径选择窗口，返回选择的路径信息
-  openDialog() {
-    return callMethod('OpenDialog', null, 'openDialog');
-  },
-  // 跳转到给定url
-  jumpPage(url) {
-    return callMethod('JumpPage', {url}, 'jumpPage');
-  },
-  // 获取指定磁盘的总容量及剩余容量
-  getDiskSenseParameter(driver) {
-    return callMethod('GetDiskSenseParameter', {driver}, 'getDiskSenseParameter');
-  },
-  // 获取系统信息（系统名称，本地时间等）
-  getSystemInformation() {
-    return callMethod('GetSystemInformation', null, 'getSystemInformation');
-  },
-  // 获取学生端页面版本号
-  getPageVersion() {
-    return callMethod('GetPageVersion', null, 'getPageVersion');
-  },
-  stopLossDelayInfo() {
-    return callMethod('StopLossDelayInfo', null);
-  },
-  /**
-  * @function 保存图片至桌面
-  * @param { string } buf //base64编码图片数据
-  * @param { string } fileName //图片文件名（带格式后缀）
-  * @return: Promise
-  */
-  saveImgToDesktop(buf, fileName) {
-    return callMethod('SaveImgToDesktop', {buf, fileName});
-  },
-  // 初始化
-  init(){
-    // 加载扩展
-    if (EM) {
-      // return new Promise(resolve => {
-      EM.Load(toolExt.name, toolExt.version, false, ()=>{
-        // resolve();
-        console.log('loadExt :zby_toolExt ......');
-      });
-      // });
-    }
-  }
-};
+/*
+ * @Author: why
+ * @Date: 2019-08-08 19:33:44
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-05-24 16:47:40
+ * @Description:
+ */
+import {toolExt, liveExt} from '../config/config';
+import callMethod from './call-method';
+const EM = window.EM;
+export default {
+  // 获取本地CPU内存占比
+  getCurCpuMemInfo: () => {
+    return callMethod('GetCurCpuMemInfo', null, 'getCurCpuMemInfo');
+  },
+
+  // ping给定的拉流url，调取一次ping30s后返回延迟及丢包信息抛出事件
+  startLossDelayPing: (args) => {
+    return callMethod('GetLossDelayInfo', args, 'startLossDelayPing');
+  },
+
+  // ping给定的拉流url，调取一次ping30s后返回延迟及丢包信息抛出事件
+  startSocialLossDelayPing: (args) => {
+    return callMethod('GetSocialLossDelayInfo', args, 'startSocialLossDelayPing');
+  },
+  // 获取上报公共字段信息
+  getCommonData() {
+    return callMethod('GetCommonData', {live_ext_ver: liveExt.version}, 'getCommonData');
+  },
+  // 打开一个路径选择窗口，返回选择的路径信息
+  openDialog() {
+    return callMethod('OpenDialog', null, 'openDialog');
+  },
+  // 跳转到给定url
+  jumpPage(url) {
+    return callMethod('JumpPage', {url}, 'jumpPage');
+  },
+  // 获取指定磁盘的总容量及剩余容量
+  getDiskSenseParameter(driver) {
+    return callMethod('GetDiskSenseParameter', {driver}, 'getDiskSenseParameter');
+  },
+  // 获取系统信息（系统名称，本地时间等）
+  getSystemInformation() {
+    return callMethod('GetSystemInformation', null, 'getSystemInformation');
+  },
+  // 获取学生端页面版本号
+  getPageVersion() {
+    return callMethod('GetPageVersion', null, 'getPageVersion');
+  },
+  stopLossDelayInfo() {
+    return callMethod('StopLossDelayInfo', null);
+  },
+  /**
+  * @function 保存图片至桌面
+  * @param { string } buf //base64编码图片数据
+  * @param { string } fileName //图片文件名（带格式后缀）
+  * @return: Promise
+  */
+  saveImgToDesktop(buf, fileName) {
+    return callMethod('SaveImgToDesktop', {buf, fileName});
+  },
+  // 初始化
+  init(){
+    // 加载扩展
+    if (EM) {
+      // return new Promise(resolve => {
+      EM.Load(toolExt.name, toolExt.version, false, ()=>{
+        // resolve();
+        console.log('loadExt :zby_toolExt ......');
+      });
+      // });
+    }
+  }
+};

package/src/tool/call-method.js

@@ -1,10 +1,10 @@
-/*
- * @Author: why
- * @Date: 2019-08-08 19:33:44
- * @LastEditors: why
- * @LastEditTime: 2019-09-10 17:05:31
- * @Description: 
- */
-import {cb} from '../util/bridge1';
-import {toolExt} from '../config/config';
+/*
+ * @Author: why
+ * @Date: 2019-08-08 19:33:44
+ * @LastEditors: why
+ * @LastEditTime: 2019-09-10 17:05:31
+ * @Description: 
+ */
+import {cb} from '../util/bridge1';
+import {toolExt} from '../config/config';
 export default cb(toolExt.name);

package/src/tool/extend.js

@@ -1,42 +1,42 @@
-/*
- * @Author: your name
- * @Date: 2020-07-09 17:07:08
- * @LastEditTime: 2020-10-19 14:20:03
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \709\zby_live_sdk\src\tool\extend.js
- */
-import BASSAPI from './base';
-
-export default {
-  // 打开对话框用于选取文件路径
-  openDialog() {
-    return BASSAPI.openDialog();
-  },
-  // 跳转页面
-  jumpPage(url) {
-    return BASSAPI.jumpPage(url);
-  },
-  // 获取指定磁盘的总容量及剩余容量
-  getDiskSenseParameter(driver) {
-    return BASSAPI.getDiskSenseParameter(driver);
-  },
-  // 获取系统信息（系统名称，本地时间等）
-  getSystemInformation() {
-    return BASSAPI.getSystemInformation();
-  },
-  // 获取cpu信息
-  getCurCpuMemInfo() {
-    return BASSAPI.getCurCpuMemInfo();
-  },
-  // 获取cpu信息
-  getPageVersion() {
-    return BASSAPI.getPageVersion();
-  },
-  getCommonData() {
-    return BASSAPI.getCommonData();
-  },
-  saveImgToDesktop(buf, fileName){
-    return BASSAPI.saveImgToDesktop(buf, fileName);
-  }
-};
+/*
+ * @Author: your name
+ * @Date: 2020-07-09 17:07:08
+ * @LastEditTime: 2020-10-19 14:20:03
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \709\zby_live_sdk\src\tool\extend.js
+ */
+import BASSAPI from './base';
+
+export default {
+  // 打开对话框用于选取文件路径
+  openDialog() {
+    return BASSAPI.openDialog();
+  },
+  // 跳转页面
+  jumpPage(url) {
+    return BASSAPI.jumpPage(url);
+  },
+  // 获取指定磁盘的总容量及剩余容量
+  getDiskSenseParameter(driver) {
+    return BASSAPI.getDiskSenseParameter(driver);
+  },
+  // 获取系统信息（系统名称，本地时间等）
+  getSystemInformation() {
+    return BASSAPI.getSystemInformation();
+  },
+  // 获取cpu信息
+  getCurCpuMemInfo() {
+    return BASSAPI.getCurCpuMemInfo();
+  },
+  // 获取cpu信息
+  getPageVersion() {
+    return BASSAPI.getPageVersion();
+  },
+  getCommonData() {
+    return BASSAPI.getCommonData();
+  },
+  saveImgToDesktop(buf, fileName){
+    return BASSAPI.saveImgToDesktop(buf, fileName);
+  }
+};

package/src/tool/index.js

@@ -1,10 +1,10 @@
-/*
- * @Author: why
- * @Date: 2019-08-08 19:33:44
- * @LastEditors: why
- * @LastEditTime: 2019-09-09 15:02:54
- * @Description: 
- */
-import api from './extend';
-
+/*
+ * @Author: why
+ * @Date: 2019-08-08 19:33:44
+ * @LastEditors: why
+ * @LastEditTime: 2019-09-09 15:02:54
+ * @Description: 
+ */
+import api from './extend';
+
 export default api;

package/src/util/bridge.js

@@ -1,87 +1,87 @@
-import {
-  extensionInfo, config
-} from '../config/config';
-import dict from '../util/dict';
-
-const currentTimeString = () => {
-  const timeString = '[' +
-    ('' + new Date().getHours()).padStart(2, '0') + ':' +
-    ('' + new Date().getMinutes()).padStart(2, '0') + ':' +
-    ('' + new Date().getSeconds()).padStart(2, '0') + ':' +
-    ('' + new Date().getMilliseconds()).padStart(3, '0') +
-    ']';
-  return timeString;
-};
-
-const callMethod = (name, args, extensionId = 'default_ext') => {
-  // EM 是寄宿于端的，浏览器中并不存在，为防止报错需要先进行能力检测
-  if (EM) {
-    return new Promise((resolve, reject) => {
-      EM.CallMethod(
-        extensionId,
-        name,
-        JSON.stringify(args),
-        (code, content) => {
-          //控制台weblog高优先级
-          if (typeof window.zby_live_sdk_weblog !== 'undefined') {
-            if (window.zby_live_sdk_weblog === true) {
-              if (name === 'WriteLog' && code == 0) {
-                console.log(
-                  currentTimeString() +
-                  `${args.msg}`);
-              } else {
-                console.log(`${name} :
-                    Time: ${currentTimeString()}
-                    Param: ${args.msg}
-                    Code: ${code}
-                    Message: ${content}`);
-              }
-            }
-          } else {
-            //sdk默认输出weblog日志，除非明确禁用；初始化之前默认输出日志，初始化后根据参数规则
-            // if (!window.zby_sdk_init_params || typeof window.zby_sdk_init_params.weblog === 'undefined' || (typeof window.zby_sdk_init_params.weblog !== 'undefined' && window.zby_sdk_init_params.weblog === true)) {
-            if ( config.weblog === true) {
-              if (name === 'WriteLog' && code == 0) {
-                console.log(
-                  currentTimeString() +
-                  `${args.msg}`);
-              } else {
-                console.log(`${name} :
-                      Time: ${currentTimeString()}
-                      Param: ${args.msg}
-                      Code: ${code}
-                      Message: ${content}`);
-              }
-            }
-          }
-          resolve({
-            code,
-            content
-          });
-        });
-    });
-  }
-};
-
-export const writeLog = (msgtype = 'info', msgbody, productName) => {
-  msgbody = typeof msgbody === 'string' ? msgbody : JSON.stringify(msgbody);
-  const args = {
-    //日志级别，0：debug,1:info,2:warnning,3:error,4:critical
-    'type': dict.logMap[msgtype],
-    'msg': `--${productName?'['+productName+']--':''} ${msgbody}`
-  };
-  callMethod('WriteLog', args);
-};
-
-if (window.EM) {
-  EM.Load('default_ext',
-    extensionInfo.version.default_ext,
-    true,
-    function (ec, content) {
-      writeLog('info', 'Load EC:' + ec + '\nContent:' + content);
-    });
-}
-
-export default {
-  writeLog
-};
+import {
+  extensionInfo, config
+} from '../config/config';
+import dict from '../util/dict';
+
+const currentTimeString = () => {
+  const timeString = '[' +
+    ('' + new Date().getHours()).padStart(2, '0') + ':' +
+    ('' + new Date().getMinutes()).padStart(2, '0') + ':' +
+    ('' + new Date().getSeconds()).padStart(2, '0') + ':' +
+    ('' + new Date().getMilliseconds()).padStart(3, '0') +
+    ']';
+  return timeString;
+};
+
+const callMethod = (name, args, extensionId = 'default_ext') => {
+  // EM 是寄宿于端的，浏览器中并不存在，为防止报错需要先进行能力检测
+  if (EM) {
+    return new Promise((resolve, reject) => {
+      EM.CallMethod(
+        extensionId,
+        name,
+        JSON.stringify(args),
+        (code, content) => {
+          //控制台weblog高优先级
+          if (typeof window.zby_live_sdk_weblog !== 'undefined') {
+            if (window.zby_live_sdk_weblog === true) {
+              if (name === 'WriteLog' && code == 0) {
+                console.log(
+                  currentTimeString() +
+                  `${args.msg}`);
+              } else {
+                console.log(`${name} :
+                    Time: ${currentTimeString()}
+                    Param: ${args.msg}
+                    Code: ${code}
+                    Message: ${content}`);
+              }
+            }
+          } else {
+            //sdk默认输出weblog日志，除非明确禁用；初始化之前默认输出日志，初始化后根据参数规则
+            // if (!window.zby_sdk_init_params || typeof window.zby_sdk_init_params.weblog === 'undefined' || (typeof window.zby_sdk_init_params.weblog !== 'undefined' && window.zby_sdk_init_params.weblog === true)) {
+            if ( config.weblog === true) {
+              if (name === 'WriteLog' && code == 0) {
+                console.log(
+                  currentTimeString() +
+                  `${args.msg}`);
+              } else {
+                console.log(`${name} :
+                      Time: ${currentTimeString()}
+                      Param: ${args.msg}
+                      Code: ${code}
+                      Message: ${content}`);
+              }
+            }
+          }
+          resolve({
+            code,
+            content
+          });
+        });
+    });
+  }
+};
+
+export const writeLog = (msgtype = 'info', msgbody, productName) => {
+  msgbody = typeof msgbody === 'string' ? msgbody : JSON.stringify(msgbody);
+  const args = {
+    //日志级别，0：debug,1:info,2:warnning,3:error,4:critical
+    'type': dict.logMap[msgtype],
+    'msg': `--${productName?'['+productName+']--':''} ${msgbody}`
+  };
+  callMethod('WriteLog', args);
+};
+
+if (window.EM) {
+  EM.Load('default_ext',
+    extensionInfo.version.default_ext,
+    true,
+    function (ec, content) {
+      writeLog('info', 'Load EC:' + ec + '\nContent:' + content);
+    });
+}
+
+export default {
+  writeLog
+};

package/src/util/bridge1.js

@@ -1,46 +1,46 @@
-/*
- * @Author: why
- * @Date: 2019-06-18 11:42:34
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2020-09-11 11:33:35
- * @Description: this is a bridge for js and app
- */
-import {productName, classType} from '../config/config';
-import defaultApi from '../default';
-const EM = window.EM;
-
-// 不需要写日志方法名集合
-const noWriteLogNames = ['GetCurCpuMemInfo', 'WriteLog', 'IsStreamAudioMuted', 'IsStreamVideoMuted'];
-
-export const cb = (extName) => {
-  // EM 是寄宿于端的，浏览器中并不存在，为防止报错需要先进行能力检测
-  if (EM) {
-    return function(name, args, sdkName){
-      const argsStr = typeof args === 'object' ? JSON.stringify({...args, classType}) : args;
-      return new Promise((resolve, reject) => {
-        EM.CallMethod(
-          extName,
-          name,
-          argsStr,
-          (code, msg) => {
-            const msgbody = `${extName}--action: ${sdkName || ''}--${name || name.charAt(0).toLowerCase() + name.slice(1)} Code: ${code}\nMessage: ${msg}\nparams:${JSON.stringify(args)}`;
-            if (code === 0) {
-              !noWriteLogNames.includes(name) && defaultApi.writeLog && defaultApi.writeLog(msgbody, productName);
-              resolve({
-                code,
-                msg: msg && /\{|\}/g.test(msg) && JSON.parse(msg)
-              });
-            } else {
-              name !== 'WriteLog' && defaultApi.writeLog && defaultApi.writeLog(msgbody, productName, 'error');
-              resolve({
-                code,
-                msg
-              });
-            }
-          });
-      }).catch(() => {
-        name !== 'WriteLog' && defaultApi.writeLog && defaultApi.writeLog(`${extName}--action: ${sdkName || ''}--${name || name.charAt(0).toLowerCase() + name.slice(1)} Code: ${code}\nMessage: ${msg}\nparams:${JSON.stringify(args)}`, productName, 'error');
-      });
-    };
-  }
-};
+/*
+ * @Author: why
+ * @Date: 2019-06-18 11:42:34
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2020-09-11 11:33:35
+ * @Description: this is a bridge for js and app
+ */
+import {productName, classType} from '../config/config';
+import defaultApi from '../default';
+const EM = window.EM;
+
+// 不需要写日志方法名集合
+const noWriteLogNames = ['GetCurCpuMemInfo', 'WriteLog', 'IsStreamAudioMuted', 'IsStreamVideoMuted'];
+
+export const cb = (extName) => {
+  // EM 是寄宿于端的，浏览器中并不存在，为防止报错需要先进行能力检测
+  if (EM) {
+    return function(name, args, sdkName){
+      const argsStr = typeof args === 'object' ? JSON.stringify({...args, classType}) : args;
+      return new Promise((resolve, reject) => {
+        EM.CallMethod(
+          extName,
+          name,
+          argsStr,
+          (code, msg) => {
+            const msgbody = `${extName}--action: ${sdkName || ''}--${name || name.charAt(0).toLowerCase() + name.slice(1)} Code: ${code}\nMessage: ${msg}\nparams:${JSON.stringify(args)}`;
+            if (code === 0) {
+              !noWriteLogNames.includes(name) && defaultApi.writeLog && defaultApi.writeLog(msgbody, productName);
+              resolve({
+                code,
+                msg: msg && /\{|\}/g.test(msg) && JSON.parse(msg)
+              });
+            } else {
+              name !== 'WriteLog' && defaultApi.writeLog && defaultApi.writeLog(msgbody, productName, 'error');
+              resolve({
+                code,
+                msg
+              });
+            }
+          });
+      }).catch(() => {
+        name !== 'WriteLog' && defaultApi.writeLog && defaultApi.writeLog(`${extName}--action: ${sdkName || ''}--${name || name.charAt(0).toLowerCase() + name.slice(1)} Code: ${code}\nMessage: ${msg}\nparams:${JSON.stringify(args)}`, productName, 'error');
+      });
+    };
+  }
+};

package/src/util/dict.js

@@ -1,51 +1,51 @@
-import util from './util';
-
-// streamType  : Number 流设备对应类型：1：视频 2：音频 3：音视频 4：截屏 5：截屏+视频 6：截屏+音频
-export const devicesMap = new Map([
-  [1, 'video'],
-  [2, 'audio'],
-  [3, 'video_and_audio'],
-  [4, 'screen'],
-  [5, 'ScreenAndVideo'],
-  [6, 'ScreenAndAudio'],
-  [8, 'loudSpeaker'],
-  [99, 'max']
-]);
-// status      : Number 设备状态 1开启 2关闭 3未找到
-export const devicesStatusMap = new Map([
-  [0, 'none'],
-  [1, 'open'],
-  [2, 'closed'],
-  [3, 'unfound'], //未找到设备
-  [4, 'error'], //异常
-  [5, 'unauthorized'], //未授权
-  [6, 'background'], //iOS 设备进入后台，设备摄像头被关闭，麦克风正常
-  [7, 'max'] //超出0-max范围的状态值都属于异常
-]);
-
-export const logMap = {
-  debug: 0,
-  info: 1,
-  warnning: 2,
-  error: 3,
-  critical: 4
-};
-
-export const roleMap = new Map([[1, 'teacher'], [2, 'student'], [3, 'assistant'], [4, 'parent']]);
-
-export const getDeviceTypeKey = value => {
-  return util.getMapKeyByValue(devicesMap, value);
-};
-
-export const getDeviceStatusKey = value => {
-  return util.getMapKeyByValue(devicesStatusMap, value);
-};
-
-export default {
-  getDeviceStatusKey,
-  getDeviceTypeKey,
-  logMap,
-  devicesMap,
-  devicesStatusMap,
-  roleMap
-};
+import util from './util';
+
+// streamType  : Number 流设备对应类型：1：视频 2：音频 3：音视频 4：截屏 5：截屏+视频 6：截屏+音频
+export const devicesMap = new Map([
+  [1, 'video'],
+  [2, 'audio'],
+  [3, 'video_and_audio'],
+  [4, 'screen'],
+  [5, 'ScreenAndVideo'],
+  [6, 'ScreenAndAudio'],
+  [8, 'loudSpeaker'],
+  [99, 'max']
+]);
+// status      : Number 设备状态 1开启 2关闭 3未找到
+export const devicesStatusMap = new Map([
+  [0, 'none'],
+  [1, 'open'],
+  [2, 'closed'],
+  [3, 'unfound'], //未找到设备
+  [4, 'error'], //异常
+  [5, 'unauthorized'], //未授权
+  [6, 'background'], //iOS 设备进入后台，设备摄像头被关闭，麦克风正常
+  [7, 'max'] //超出0-max范围的状态值都属于异常
+]);
+
+export const logMap = {
+  debug: 0,
+  info: 1,
+  warnning: 2,
+  error: 3,
+  critical: 4
+};
+
+export const roleMap = new Map([[1, 'teacher'], [2, 'student'], [3, 'assistant'], [4, 'parent']]);
+
+export const getDeviceTypeKey = value => {
+  return util.getMapKeyByValue(devicesMap, value);
+};
+
+export const getDeviceStatusKey = value => {
+  return util.getMapKeyByValue(devicesStatusMap, value);
+};
+
+export default {
+  getDeviceStatusKey,
+  getDeviceTypeKey,
+  logMap,
+  devicesMap,
+  devicesStatusMap,
+  roleMap
+};