zby-live-sdk 1.0.49-beta20230402 → 1.0.49-beta20230427

package/package.json

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

package/src/channel/pomelo/index.js

@@ -21,15 +21,15 @@ const pomeloObj = {
       return;
     }
     this.log('channel_log : start joining pomelo ......');
-    const { userId, roomId, chatUrl, userName, role, institutionId, guid, orgId} = args;
-    const _args = { userId, roomId, host: chatUrl, userName, institutionId, guid, role: polemoUtil.translateRole(role), orgId};
+    const { userId, roomId, chatUrl, userName, role, institutionId, guid} = args;
+    const _args = { userId, roomId, host: chatUrl, userName, institutionId, guid, role: polemoUtil.translateRole(role) };
     this.log(`joinRoom: args: ${JSON.stringify(_args)}`);
     this.initParams = _args;
     // 定时检查发送消息列表
     // this.checkSendMsgList();
     const res = await pomeloClient.joinRoom({
       ..._args,
-      roomId: `${roomId}_${institutionId}_${orgId}`
+      roomId: util.getConfId(institutionId, roomId)
     }, dealCb);
     // 加入房间成功
     if (res.code === 200) {

package/src/channel/pomelo/polemo.js

@@ -628,8 +628,7 @@ class PomeloClient {
       role: channelInfo.role,
       classid: channelInfo.roomId,
       protocolVersion: '1.0',
-      uniqId: channelInfo.guid,
-      orgId: channelInfo.orgId
+      uniqId: channelInfo.guid
     };
 
     return new Promise(async (resolve, reject) => {

package/src/config/config.js

@@ -7,13 +7,18 @@ const prefix = {
   online : ''
 };
 
+const saasModeApi = {
+  1: 'Bp', // 标品
+  2: '', // 银联
+}
+
 const urls = {
   api : 'api.weclassroom.com',
   report : 's.weclassroom.com'
 };
 
 // export const version = require('../../package.json').version;
-export const version = '1.0.49-beta20230402';
+export const version = '1.0.49-beta20230427';
 
 export const liveExt = {
   name: 'live',
@@ -64,6 +69,7 @@ export let config = {
   isHttps: true,
   env: 'test',
   weblog: true,
+  saasMode: 2,
 };
 
 export const getBaseUrl = (type='api') => {
@@ -114,14 +120,21 @@ const apiMixStreams = {
   online: 'https://tf-classroom-online.vdyoo.com'
 };
 
+//开启混流-标品
+const apiMixStreamsBp = {
+  test: 'https://tf-bp-classroom-test.vdyoo.com',
+  online: 'https://tf-classroom-online.vdyoo.com'
+};
+
 export const getApiCloudBaseUrl = () => {
   const {env} = config;
   return apiCloudUrl[env];
 };
 
 export const getApiMixStreams = () => {
-  const {env} = config;
-  return apiMixStreams[env];
+  const { env ,saasMode} = config;
+  const urls = `apiMixStreams${saasModeApi[saasMode]}`
+  return urls[env];
 }
 
 export const getApiChangeSdkUrl = () => {

package/src/zby-live-sdk.js

@@ -153,6 +153,8 @@ function caculateDeatailArgs(baseArgs, cloudData) {
       live_id: baseArgs.liveId,
       // 课堂模式，0=小组课/1=新小班
       classMode: +baseArgs.classMode,
+      // saas业务类型-不同的saas业务线有不同的域名(不传默认是银联) 1=标品 
+      saasMode: +baseArgs.saasMode, 
       //数据上报班课类型
       liveType: +baseArgs.liveType,
       //是否开启转推功能