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

package/src/config/config.js

@@ -1,153 +1,153 @@
-import {getInitParams} from '../network/api';
-
-const prefix = {
-  dev : 'dev-',
-  test : 'test-',
-  pre : 'pre-',
-  online : ''
-};
-
-const urls = {
-  api : 'api.weclassroom.com',
-  report : 's.weclassroom.com'
-};
-
-// export const version = require('../../package.json').version;
-export const version = '1.0.49-beta-talrtc0922';
-
-export const liveExt = {
-  name: 'live',
-  version: '1.0.0.0'
-};
-export const toolExt = {
-  name: 'tool',
-  version: '1.0.0.0'
-};
-export const defaultExt = {
-  name: 'default_ext',
-  version: '1.0.0.0'
-};
-export const zegoExt = {
-  name: 'zego_ext',
-  version: '1.0.0.0'
-};
-export const utilitiesExt = {
-  name: 'utilities_ext',
-  version: '1.0.0.0'
-};
-export const talrtcExt = {
-  name: 'talrtc_ext',
-  version: '1.0.0.0'
-};
-
-// 小班=0，大班=1
-export const classType = 0;
-export const productName = 'zby-live-sdk';
-
-export const zegoSdkName = 'zego';
-export const talSdkName = 'Tal';
-export const rtcSdkName = 'rtc';
-export const tmSdkName = 'tm';
-export const talrtcSdkName = 'talrtc';
-
-export const extensionInfo = {
-  version:{
-    default_ext : '1.0.0.0'
-    // arora : '1.0.0.1',
-    // rtc   : '1.0.0.0',
-    // zego  : '1.0.0.0',
-    // tool  : '1.0.0.0'
-  }
-};
-
-export let config = {
-  isHttps: true,
-  env: 'test',
-  weblog: true,
-};
-
-export const getBaseUrl = (type='api') => {
-  const {isHttps,env} = config;
-  return `${isHttps ? 'https://' : 'http://'}${prefix[env ? env : 'online']}${urls[type]}`;
-};
-
-export const getCloudApiDomain = () => {
-  if (window.zby_sdk_cloud_api_domain) {
-    return window.zby_sdk_cloud_api_domain;
-  }
-  return getBaseUrl();
-};
-
-const reportUrls = {
-  // test: 'test-dp.weclassroom.com:10443/report',
-  // online: 'dp.weclassroom.com:443/report'
-  test: 'testdp-s.weclassroom.com/report',
-  online: 'dp-s.weclassroom.com/report '
-};
-
-const logAddressInit = {
-  test: 'live_test_log',
-  online: 'live_log'
-};
-
-// 从三方服务器获取时间戳
-export const timestampUrl = {
-  suning: 'https://quan.suning.com/getSysTime.do',
-  taobao: 'https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp'
-};
-
-// 获取初始化数据
-const apiCloudUrl = {
-  test: 'https://test-api-cloud-control-zhibo.speiyou.com/live-cloud-control',
-  online: 'https://api-cloud-control-zhibo.speiyou.com/live-cloud-control'
-};
-
-//切换sdk类型
-const apiChangeSdkUrl = {
-  test: 'https://test-cloud-platform-live.speiyou.com/cloud-platform',
-  online: 'https://cloud-platform-live.speiyou.com/cloud-platform'
-};
-
-export const getApiCloudBaseUrl = () => {
-  const {env} = config;
-  return apiCloudUrl[env];
-};
-
-export const getApiChangeSdkUrl = () => {
-  const {env} = config;
-  return apiChangeSdkUrl[env];
-};
-
-export let dabanReportUrl = '';
-export let logAddress = '';
-
-export const getReportBaseUrl = () => {
-  if (dabanReportUrl) {
-    return dabanReportUrl;
-  }
-  const {env} = config;
-  return `https://${reportUrls[env]}`;
-};
-
-export const getLogAddress = () => {
-  const {env} = config;
-  console.log('logAddresshsghsg',env,logAddressInit[env]);
-  logAddress = logAddressInit[env];
-  // return logAddress;
-};
-
-
-export  const getAndSetInitParams = async (args) => {
-  const res = await getInitParams(args);
-  if (res && res.actionUrl) {
-    dabanReportUrl = res.actionUrl;
-    console.log(dabanReportUrl);
-  }
-};
-
-export default {
-  version,
-  extensionInfo,
-  getBaseUrl,
-  config
-};
+import {getInitParams} from '../network/api';
+
+const prefix = {
+  dev : 'dev-',
+  test : 'test-',
+  pre : 'pre-',
+  online : ''
+};
+
+const urls = {
+  api : 'api.weclassroom.com',
+  report : 's.weclassroom.com'
+};
+
+// export const version = require('../../package.json').version;
+export const version = '1.0.49-beta-talrtc1014';
+
+export const liveExt = {
+  name: 'live',
+  version: '1.0.0.0'
+};
+export const toolExt = {
+  name: 'tool',
+  version: '1.0.0.0'
+};
+export const defaultExt = {
+  name: 'default_ext',
+  version: '1.0.0.0'
+};
+export const zegoExt = {
+  name: 'zego_ext',
+  version: '1.0.0.0'
+};
+export const utilitiesExt = {
+  name: 'utilities_ext',
+  version: '1.0.0.0'
+};
+export const talrtcExt = {
+  name: 'talrtc_ext',
+  version: '1.0.0.0'
+};
+
+// 小班=0，大班=1
+export const classType = 0;
+export const productName = 'zby-live-sdk';
+
+export const zegoSdkName = 'zego';
+export const talSdkName = 'Tal';
+export const rtcSdkName = 'rtc';
+export const tmSdkName = 'tm';
+export const talrtcSdkName = 'talrtc';
+
+export const extensionInfo = {
+  version:{
+    default_ext : '1.0.0.0'
+    // arora : '1.0.0.1',
+    // rtc   : '1.0.0.0',
+    // zego  : '1.0.0.0',
+    // tool  : '1.0.0.0'
+  }
+};
+
+export let config = {
+  isHttps: true,
+  env: 'test',
+  weblog: true,
+};
+
+export const getBaseUrl = (type='api') => {
+  const {isHttps,env} = config;
+  return `${isHttps ? 'https://' : 'http://'}${prefix[env ? env : 'online']}${urls[type]}`;
+};
+
+export const getCloudApiDomain = () => {
+  if (window.zby_sdk_cloud_api_domain) {
+    return window.zby_sdk_cloud_api_domain;
+  }
+  return getBaseUrl();
+};
+
+const reportUrls = {
+  // test: 'test-dp.weclassroom.com:10443/report',
+  // online: 'dp.weclassroom.com:443/report'
+  test: 'testdp-s.weclassroom.com/report',
+  online: 'dp-s.weclassroom.com/report '
+};
+
+const logAddressInit = {
+  test: 'live_test_log',
+  online: 'live_log'
+};
+
+// 从三方服务器获取时间戳
+export const timestampUrl = {
+  suning: 'https://quan.suning.com/getSysTime.do',
+  taobao: 'https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp'
+};
+
+// 获取初始化数据
+const apiCloudUrl = {
+  test: 'https://test-api-cloud-control-zhibo.speiyou.com/live-cloud-control',
+  online: 'https://api-cloud-control-zhibo.speiyou.com/live-cloud-control'
+};
+
+//切换sdk类型
+const apiChangeSdkUrl = {
+  test: 'https://test-cloud-platform-live.speiyou.com/cloud-platform',
+  online: 'https://cloud-platform-live.speiyou.com/cloud-platform'
+};
+
+export const getApiCloudBaseUrl = () => {
+  const {env} = config;
+  return apiCloudUrl[env];
+};
+
+export const getApiChangeSdkUrl = () => {
+  const {env} = config;
+  return apiChangeSdkUrl[env];
+};
+
+export let dabanReportUrl = '';
+export let logAddress = '';
+
+export const getReportBaseUrl = () => {
+  if (dabanReportUrl) {
+    return dabanReportUrl;
+  }
+  const {env} = config;
+  return `https://${reportUrls[env]}`;
+};
+
+export const getLogAddress = () => {
+  const {env} = config;
+  console.log('logAddresshsghsg',env,logAddressInit[env]);
+  logAddress = logAddressInit[env];
+  // return logAddress;
+};
+
+
+export  const getAndSetInitParams = async (args) => {
+  const res = await getInitParams(args);
+  if (res && res.actionUrl) {
+    dabanReportUrl = res.actionUrl;
+    console.log(dabanReportUrl);
+  }
+};
+
+export default {
+  version,
+  extensionInfo,
+  getBaseUrl,
+  config
+};

package/src/default/base.js

@@ -1,71 +1,71 @@
-/*
- * @Author: why
- * @Date: 2019-08-08 19:33:44
- * @LastEditors: why
- * @LastEditTime: 2019-09-11 15:35:34
- * @Description: 
- */
-import {defaultExt, classType} from '../config/config';
-const EM = window.EM;
-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) {
-              name !== 'WriteLog' && 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');
-      });
-    };
-  }
-};
-const callMethod = cb(defaultExt.name);
-export default {
-  // 初始化
-  init() {
-    // 加载扩展
-    if (EM) {
-      return new Promise(resolve => {
-        EM.Load(defaultExt.name, defaultExt.version, false, ()=>{
-          resolve();
-        });
-      });
-    }
-  },
-  writeLog(args) {
-    return callMethod('WriteLog', args);
-  },
-  /**
-   * @function 设置用户信息
-   * @param {string} userId 用户id
-   * @param {string} institutionId 机构id
-   * @return: void
-   */
-  setUserInfo(userId, institutionId) {
-    return callMethod('SetUserInfo', {
-      user_id: userId + '',
-      institution_id: institutionId + '',
-      description: ''
-    });
-  },
+/*
+ * @Author: why
+ * @Date: 2019-08-08 19:33:44
+ * @LastEditors: why
+ * @LastEditTime: 2019-09-11 15:35:34
+ * @Description: 
+ */
+import {defaultExt, classType} from '../config/config';
+const EM = window.EM;
+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) {
+              name !== 'WriteLog' && 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');
+      });
+    };
+  }
+};
+const callMethod = cb(defaultExt.name);
+export default {
+  // 初始化
+  init() {
+    // 加载扩展
+    if (EM) {
+      return new Promise(resolve => {
+        EM.Load(defaultExt.name, defaultExt.version, false, ()=>{
+          resolve();
+        });
+      });
+    }
+  },
+  writeLog(args) {
+    return callMethod('WriteLog', args);
+  },
+  /**
+   * @function 设置用户信息
+   * @param {string} userId 用户id
+   * @param {string} institutionId 机构id
+   * @return: void
+   */
+  setUserInfo(userId, institutionId) {
+    return callMethod('SetUserInfo', {
+      user_id: userId + '',
+      institution_id: institutionId + '',
+      description: ''
+    });
+  },
 };

package/src/default/extend.js

@@ -1,36 +1,36 @@
-import BASSAPI from './base';
-import {config} from '../config/config';
-import util from '../util/util';
-
-export default {
-  /**
-   * @function 写日志
-   * @param {string} msgbody 内容
-   * @param {string} productName 产品名称
-   * @param {string} msgtype 类型
-   * @return: void
-   */
-  async writeLog (msgbody, productName='zby-live-sdk', msgtype = 'info') {
-    const logMap = {
-      debug    : 0,
-      info     : 1,
-      warnning : 2,
-      error    : 3,
-      critical : 4
-    };
-    msgbody = typeof msgbody === 'string' ? msgbody : JSON.stringify(msgbody);
-    const args = {
-      //日志级别，0：debug,1:info,2:warnning,3:error,4:critical
-      'type': logMap[msgtype],
-      'msg': `${productName?'['+productName+']--':''} ${msgbody}`
-    };
-    await BASSAPI.writeLog(args);
-    if (config.weblog === true) {
-      if (msgtype === 'info') {
-        console.log(`%c [${util.currentTimeString()}]--${args.msg}`, 'color:#60acfc');
-      } else {
-        console.log(`%c [${util.currentTimeString()}]--${args.msg}`, 'color:#f00');
-      }
-    }
-  }
-};
+import BASSAPI from './base';
+import {config} from '../config/config';
+import util from '../util/util';
+
+export default {
+  /**
+   * @function 写日志
+   * @param {string} msgbody 内容
+   * @param {string} productName 产品名称
+   * @param {string} msgtype 类型
+   * @return: void
+   */
+  async writeLog (msgbody, productName='zby-live-sdk', msgtype = 'info') {
+    const logMap = {
+      debug    : 0,
+      info     : 1,
+      warnning : 2,
+      error    : 3,
+      critical : 4
+    };
+    msgbody = typeof msgbody === 'string' ? msgbody : JSON.stringify(msgbody);
+    const args = {
+      //日志级别，0：debug,1:info,2:warnning,3:error,4:critical
+      'type': logMap[msgtype],
+      'msg': `${productName?'['+productName+']--':''} ${msgbody}`
+    };
+    await BASSAPI.writeLog(args);
+    if (config.weblog === true) {
+      if (msgtype === 'info') {
+        console.log(`%c [${util.currentTimeString()}]--${args.msg}`, 'color:#60acfc');
+      } else {
+        console.log(`%c [${util.currentTimeString()}]--${args.msg}`, 'color:#f00');
+      }
+    }
+  }
+};

package/src/default/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/live/base.js

@@ -1,43 +1,43 @@
-/*
- * @Author: why
- * @Date: 2019-08-08 19:33:44
- * @LastEditors: why
- * @LastEditTime: 2019-09-11 15:35:34
- * @Description: 
- */
-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', {});
-  },
-  async isStreamAudioMuted() {
-    return callMethod('IsStreamAudioMuted', {});
-  },
-  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(){
-    // 加载扩展
-    if (EM) {
-      return new Promise(resolve => {
-        EM.Load(liveExt.name, liveExt.version, false, ()=>{
-          resolve();
-        });
-      });
-    }
-  }
+/*
+ * @Author: why
+ * @Date: 2019-08-08 19:33:44
+ * @LastEditors: why
+ * @LastEditTime: 2019-09-11 15:35:34
+ * @Description: 
+ */
+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', {});
+  },
+  async isStreamAudioMuted() {
+    return callMethod('IsStreamAudioMuted', {});
+  },
+  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(){
+    // 加载扩展
+    if (EM) {
+      return new Promise(resolve => {
+        EM.Load(liveExt.name, liveExt.version, false, ()=>{
+          resolve();
+        });
+      });
+    }
+  }
 };

package/src/live/call-method.js

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