@hysc/meeting 5.0.84 → 5.0.86

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,25 +9,37 @@
9
9
  * 标品排序规则
10
10
  */
11
11
  export declare enum MODEL_SORT_ENUM_STAND {
12
- SCREEN = 0,
13
- MASTER = 1,
14
- LOCAL = 2,
15
- MANAGER_AUDIO_VIDEO = 3,
16
- MANAGER_AUDIO = 4,
17
- MANAGER_VIDEO = 5,
18
- MANAGER = 6,
19
- RAISE_HAND = 7,
20
- RAISE_AUDIO = 8,
21
- RAISE_VIDEO = 9,
22
- GUEST_AUDIO_VIDEO = 10,
23
- GUEST_AUDIO = 11,
24
- GUEST_VIDEO = 12,
25
- GUEST = 13,
26
- SIGNAL = 14,
27
- COMMONUSER_AUDIO_VIDEO = 15,
28
- COMMONUSER_AUDIO = 16,
29
- COMMONUSER_VIDEO = 17,
30
- OTHER = 18
12
+ SCREEN_MASTER = 0,
13
+ SCREEN_MANAGER_AUDIO_VIDEO = 1,
14
+ SCREEN_MANAGER_AUDIO = 2,
15
+ SCREEN_MANAGER_VIDEO = 3,
16
+ SCREEN_MANAGER = 4,
17
+ SCREEN_GUEST_AUDIO_VIDEO = 5,
18
+ SCREEN_GUEST_AUDIO = 6,
19
+ SCREEN_GUEST_VIDEO = 7,
20
+ SCREEN_GUEST = 8,
21
+ SCREEN_COMMONUSER_AUDIO_VIDEO = 9,
22
+ SCREEN_COMMONUSER_AUDIO = 10,
23
+ SCREEN_COMMONUSER_VIDEO = 11,
24
+ SCREEN_OTHER = 12,
25
+ MASTER = 13,
26
+ LOCAL = 14,
27
+ MANAGER_AUDIO_VIDEO = 15,
28
+ MANAGER_AUDIO = 16,
29
+ MANAGER_VIDEO = 17,
30
+ MANAGER = 18,
31
+ RAISE_HAND = 19,
32
+ RAISE_AUDIO = 20,
33
+ RAISE_VIDEO = 21,
34
+ GUEST_AUDIO_VIDEO = 22,
35
+ GUEST_AUDIO = 23,
36
+ GUEST_VIDEO = 24,
37
+ GUEST = 25,
38
+ SIGNAL = 26,
39
+ COMMONUSER_AUDIO_VIDEO = 27,
40
+ COMMONUSER_AUDIO = 28,
41
+ COMMONUSER_VIDEO = 29,
42
+ OTHER = 30
31
43
  }
32
44
  /**
33
45
  * 中移排序规则
@@ -5,6 +5,7 @@ import BMUserVM from "../BMUser/BMUserVM";
5
5
  import BMChatVM from '../BMChat/BMChatVM';
6
6
  import { BehaviorSubject } from 'rxjs';
7
7
  import { BCEvent } from "@hysc/core/src/BoomCore/BCClient/clientEventType";
8
+ import type { StreamCustomInfo } from '@hysc/bloud';
8
9
  /**
9
10
  * 收到消息信令的集合
10
11
  */
@@ -33,6 +34,7 @@ export interface BloudStreamState {
33
34
  video: boolean;
34
35
  audio: boolean;
35
36
  isScreen: boolean;
37
+ customInfo?: StreamCustomInfo;
36
38
  }
37
39
  export interface BloudUnPubEvent {
38
40
  userId: string;
@@ -7,4 +7,4 @@
7
7
  */
8
8
  import BMUser from "../BMUser/BMUser";
9
9
  import { MODEL_SORT_ENUM_STAND, MODEL_SORT_ENUM_ZY } from "../constants";
10
- export declare function getSortNum(user: BMUser): MODEL_SORT_ENUM_ZY | MODEL_SORT_ENUM_STAND;
10
+ export declare function getSortNum(user: BMUser): MODEL_SORT_ENUM_STAND | MODEL_SORT_ENUM_ZY;
@@ -66,7 +66,8 @@ export declare function timestampMillisecond(diffNTP?: number): number;
66
66
  * @returns {string} 12:09
67
67
  */
68
68
  export declare function handleTime(timeStamp: number): string;
69
- export declare function sortStreamModelsOrUser<T extends BMUser | BMStreamModel>(list: T[], reverse?: boolean): T[];
69
+ export declare function sortUsers(list: BMUser[]): BMUser[];
70
+ export declare function sortStreamModels(list: BMStreamModel[]): BMStreamModel[];
70
71
  /**
71
72
  * 根据权限判断是不是普通参会者
72
73
  * @param permission
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hysc/meeting",
3
- "version": "5.0.84",
3
+ "version": "5.0.86",
4
4
  "description": "boom meeting",
5
5
  "main": "umd/index.js",
6
6
  "module": "esm/index.js",
@@ -14,7 +14,8 @@
14
14
  "author": "yangliye",
15
15
  "license": "MIT",
16
16
  "dependencies": {
17
- "@hysc/core": "5.0.82",
17
+ "@hysc/bloud": "1.0.84",
18
+ "@hysc/core": "5.0.84",
18
19
  "@hysc/logger": "1.0.0",
19
20
  "lodash-es": "^4.17.21",
20
21
  "mitt": "^3.0.0",
@@ -24,7 +25,7 @@
24
25
  "@hysc/utils": "1.2.4"
25
26
  },
26
27
  "peerDependencies": {
27
- "@hysc/core": "5.0.82"
28
+ "@hysc/core": "5.0.84"
28
29
  },
29
30
  "devDependencies": {
30
31
  "@types/lodash-es": "^4.17.6"
@@ -422,6 +422,7 @@ export declare enum BCEvent {
422
422
  JOIN_READY = "join-ready",
423
423
  BRTC_SHARE_SYNC_ROOM_COMPLETED = "brtc-share-sync-room-completed",
424
424
  LEAVE_USERS = "leaveUsers",
425
- ROOM_ERROR = "error-room"
425
+ ROOM_ERROR = "error-room",
426
+ UPDDATE_STREAM = "update-stream"
426
427
  }
427
428
  export default BCEvent;
@@ -109,6 +109,7 @@ export default class BMRoom {
109
109
  brtcNetEnableWatcher: Subject<boolean>;
110
110
  autoPlayAudio: boolean;
111
111
  audioPlayer: AudioPlay;
112
+ private pubFailedTimer;
112
113
  get isSingleColumns(): boolean;
113
114
  /**
114
115
  * 传递信息用的,主要是用于message信令往上层业务发送消息
@@ -9,25 +9,37 @@
9
9
  * 标品排序规则
10
10
  */
11
11
  export declare enum MODEL_SORT_ENUM_STAND {
12
- SCREEN = 0,
13
- MASTER = 1,
14
- LOCAL = 2,
15
- MANAGER_AUDIO_VIDEO = 3,
16
- MANAGER_AUDIO = 4,
17
- MANAGER_VIDEO = 5,
18
- MANAGER = 6,
19
- RAISE_HAND = 7,
20
- RAISE_AUDIO = 8,
21
- RAISE_VIDEO = 9,
22
- GUEST_AUDIO_VIDEO = 10,
23
- GUEST_AUDIO = 11,
24
- GUEST_VIDEO = 12,
25
- GUEST = 13,
26
- SIGNAL = 14,
27
- COMMONUSER_AUDIO_VIDEO = 15,
28
- COMMONUSER_AUDIO = 16,
29
- COMMONUSER_VIDEO = 17,
30
- OTHER = 18
12
+ SCREEN_MASTER = 0,
13
+ SCREEN_MANAGER_AUDIO_VIDEO = 1,
14
+ SCREEN_MANAGER_AUDIO = 2,
15
+ SCREEN_MANAGER_VIDEO = 3,
16
+ SCREEN_MANAGER = 4,
17
+ SCREEN_GUEST_AUDIO_VIDEO = 5,
18
+ SCREEN_GUEST_AUDIO = 6,
19
+ SCREEN_GUEST_VIDEO = 7,
20
+ SCREEN_GUEST = 8,
21
+ SCREEN_COMMONUSER_AUDIO_VIDEO = 9,
22
+ SCREEN_COMMONUSER_AUDIO = 10,
23
+ SCREEN_COMMONUSER_VIDEO = 11,
24
+ SCREEN_OTHER = 12,
25
+ MASTER = 13,
26
+ LOCAL = 14,
27
+ MANAGER_AUDIO_VIDEO = 15,
28
+ MANAGER_AUDIO = 16,
29
+ MANAGER_VIDEO = 17,
30
+ MANAGER = 18,
31
+ RAISE_HAND = 19,
32
+ RAISE_AUDIO = 20,
33
+ RAISE_VIDEO = 21,
34
+ GUEST_AUDIO_VIDEO = 22,
35
+ GUEST_AUDIO = 23,
36
+ GUEST_VIDEO = 24,
37
+ GUEST = 25,
38
+ SIGNAL = 26,
39
+ COMMONUSER_AUDIO_VIDEO = 27,
40
+ COMMONUSER_AUDIO = 28,
41
+ COMMONUSER_VIDEO = 29,
42
+ OTHER = 30
31
43
  }
32
44
  /**
33
45
  * 中移排序规则
@@ -5,6 +5,7 @@ import BMUserVM from "../BMUser/BMUserVM";
5
5
  import BMChatVM from '../BMChat/BMChatVM';
6
6
  import { BehaviorSubject } from 'rxjs';
7
7
  import { BCEvent } from "@hysc/core/src/BoomCore/BCClient/clientEventType";
8
+ import type { StreamCustomInfo } from '@hysc/bloud';
8
9
  /**
9
10
  * 收到消息信令的集合
10
11
  */
@@ -33,6 +34,7 @@ export interface BloudStreamState {
33
34
  video: boolean;
34
35
  audio: boolean;
35
36
  isScreen: boolean;
37
+ customInfo?: StreamCustomInfo;
36
38
  }
37
39
  export interface BloudUnPubEvent {
38
40
  userId: string;
@@ -66,7 +66,8 @@ export declare function timestampMillisecond(diffNTP?: number): number;
66
66
  * @returns {string} 12:09
67
67
  */
68
68
  export declare function handleTime(timeStamp: number): string;
69
- export declare function sortStreamModelsOrUser<T extends BMUser | BMStreamModel>(list: T[], reverse?: boolean): T[];
69
+ export declare function sortUsers(list: BMUser[]): BMUser[];
70
+ export declare function sortStreamModels(list: BMStreamModel[]): BMStreamModel[];
70
71
  /**
71
72
  * 根据权限判断是不是普通参会者
72
73
  * @param permission