zby-live-sdk 1.0.49-beta20230302 → 1.0.49-beta20230324

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zby-live-sdk",
-  "version": "1.0.49-beta20230302",
+  "version": "1.0.49-beta20230324",
   "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,8 +21,8 @@ const pomeloObj = {
       return;
     }
     this.log('channel_log : start joining pomelo ......');
-    const { userId, roomId, chatUrl, userName, role, institutionId, guid} = args;
-    const _args = { userId, roomId, host: chatUrl, userName, institutionId, guid, role: polemoUtil.translateRole(role) };
+    const { userId, roomId, chatUrl, userName, role, institutionId, guid, orgId} = args;
+    const _args = { userId, roomId, host: chatUrl, userName, institutionId, guid, role: polemoUtil.translateRole(role), orgId};
     this.log(`joinRoom: args: ${JSON.stringify(_args)}`);
     this.initParams = _args;
     // 定时检查发送消息列表

package/src/channel/pomelo/polemo.js

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

package/src/config/config.js

@@ -13,7 +13,7 @@ const urls = {
 };
 
 // export const version = require('../../package.json').version;
-export const version = '1.0.49-beta20230302';
+export const version = '1.0.49-beta20230324';
 
 export const liveExt = {
   name: 'live',

package/src/network/dataReport.js

@@ -269,6 +269,13 @@ export default {
       event_content:{...args}
     });
   },
+  //推拉流事件
+  streamEvent(args){
+    dataReport({
+      event_name: 'on_stream_event',
+      event_content:{...args}
+    });
+  },
   //退出教室
   leaveRoom(args){
     dataReport({

package/src/notice.js

@@ -168,6 +168,20 @@ export default {
       data
     });
   },
+  // SDK自动重试推流成功
+  retryPushFlowSuccess(data) {
+    notice({
+      type:'retryPushFlowSuccess',
+      data
+    });
+  },
+  // SDK自动重试拉流成功
+  retryPullFlowSuccess(data) {
+    notice({
+      type:'retryPullFlowSuccess',
+      data
+    });
+  },
   pullFlowResult(data) {
     notice({
       type:'pullFlowResult',

package/src/zby-av-sdk/zego-sdk.js

@@ -272,6 +272,39 @@ const addListener = (userId, userName, confId, nNetType, devices) => {
           }
         }
         break;
+      case 'OnStreamEvent':
+      {
+        let res = JSON.parse(data);
+        let keys = Object.keys(res);
+        if (keys.indexOf('event') > -1) {
+          switch (res.event) {
+          case 104:
+            try {
+              NOTICE.retryPushFlowSuccess({code:0,publish_streamid: _data.pszStreamID});
+            } catch (e) {};
+            break;
+          case 204:
+            try {
+              NOTICE.retryPullFlowSuccess({code:0,publish_streamid: _data.pszStreamID});
+            } catch (e) {};
+            break;
+          default:
+            break;
+          }
+          // 103开始重试推流， 104重试推流成功，105重试推流失败，203开始重试拉流，204重试拉流成功，205重试拉流失败
+          try {
+            let ReportArgs = {};
+              ReportArgs.streamevent = res.event;
+            if(_data.pszStreamID.split('_').length == 5 ){
+              ReportArgs.streamid = _data.pszStreamID;
+            }
+            dataReport.streamEvent({
+              code: '0',
+              ...ReportArgs
+            });
+          } catch (e) {};
+        }
+      }
       case 'OnPublishQualityUpdate':
         if (_data.hasOwnProperty('pq') && (_data.pszStreamID).split('_').length != 5) {
           // 主辅两路质量回调,丢包延时只上抛一次，过滤掉辅路数据