@hysc/meeting 10.5.7 → 10.5.9

package/dist/index.d.mts

@@ -1,7 +1,8 @@
+import * as BCClient from '@hysc/core';
+import BCClient__default, { ShareMediaOptions, Player, BCUser, AudioPlayer, SMConfig } from '@hysc/core';
 import * as lodash_es from 'lodash-es';
 import * as _hysc_brtc from '@hysc/brtc';
 import { LocalStream, RemoteStream, Device, SubscribeOptions, VideoProfile, AudioHint, StreamCodecOption } from '@hysc/brtc';
-import BCClient, { ShareMediaOptions, Player, BCUser, AudioPlayer, SMConfig } from '@hysc/core';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { BoomError } from '@hysc/utils';
 export { Logger } from '@hysc/utils';
@@ -28,6 +29,25 @@ declare type audioOffWatcherValue = {
     selfopenaudio: boolean;
 };
 
+/**
+ * @name: index.ts
+ * @author: yangliye
+ * @date: 2022-04-25 13:42
+ * @description：index.ts
+ * @update: 2022-04-25 13:42
+ */
+
+/** 举手相关操作 */
+interface RaiseHandsParams {
+    raiseHandsType: 0 | 1 | 2 | 3 | 4;
+    raiseHands: boolean;
+    raiseInfo?: {
+        userId: string;
+        raiseHandTime: number;
+        type: 'raiseHandsAudio' | 'raiseHandsVideo' | 'raiseHand';
+    };
+}
+
 /**
  * @name: BMSpeaker
  * @author: liuxinghai
@@ -123,12 +143,12 @@ declare class BMMessageInfo {
 
 declare class BMChatVM {
     messageList: Array<BMMessageInfo>;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     userVM: BMUserVM;
     bmRoom: BMRoom;
     messageListWatcher: BehaviorSubject<Array<BMMessageInfo>>;
     hasDangerMessageWatcher: Subject<boolean>;
-    constructor(boomCore: BCClient, userVM: BMUserVM, bmRoom: BMRoom);
+    constructor(boomCore: BCClient__default, userVM: BMUserVM, bmRoom: BMRoom);
     /**
      * 发送聊天消息
      * @param talkMsg 聊天信息
@@ -905,7 +925,7 @@ declare class BMUserVM {
     signalList: Map<string, BMUser>;
     /** 大房间,普通参会者列表 */
     commonUserList: Map<string, BMUser>;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     room: BMRoom;
     /** 嘉宾及以上列表 */
     userListWatcher: BehaviorSubject<BMUser[]>;
@@ -919,7 +939,7 @@ declare class BMUserVM {
     getForceUserWatcher: BehaviorSubject<boolean>;
     localUser: BMUser;
     commTimer: number;
-    constructor(boomCore: BCClient, localUser: BMUser, room: BMRoom);
+    constructor(boomCore: BCClient__default, localUser: BMUser, room: BMRoom);
     handleUserRoleChange(info: ChangeIsGuest): Promise<void>;
     /**
      * 添加用户, 并返回已添加的用户对象
@@ -1003,6 +1023,7 @@ declare class BMUserVM {
     private sortCommonUsers;
     private sortSignalUsers;
     private static filterUsers;
+    private static filterUser;
     /**
      * 排序变化之后的处理逻辑
      */
@@ -1036,6 +1057,19 @@ declare class BMUserVM {
         userList: BMUser[];
         total: number;
     }>;
+    /**
+     * 获取观众列表
+     * @param page
+     * @param pageSize
+     * @param mode
+     */
+    getAudiencesList(page: number, pageSize: number, mode?: 'map' | 'array'): Promise<{
+        userList: Map<string, BMUser>;
+        total: number;
+    } | {
+        userList: BMUser[];
+        total: number;
+    }>;
     getUsersList(page: number, pageSize: number, permission?: string, waitRoom?: boolean): Promise<{
         userList: BMUser[];
         total: number;
@@ -1356,13 +1390,13 @@ interface AudioProfileInfo {
 }
 declare class BMRoomVM {
     roomInfo: BMRoomInfo;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     userVM: BMUserVM;
     giveLikeListWatcher: Subject<Array<giveLikeItem>>;
     giveLikeList: Array<giveLikeItem>;
     private room;
     tipQueueObj: any;
-    constructor(boomCore: BCClient, userVM: any, roomInfo: BMRoomInfo);
+    constructor(boomCore: BCClient__default, userVM: any, roomInfo: BMRoomInfo);
     initWithRoom(room: BMRoom): void;
     /**
      * 踢出用户
@@ -1425,9 +1459,15 @@ declare class BMRoomVM {
      * @param raise 举手还是放下举手 true/false
      */
     raiseHands(type: 'audio' | 'video' | 'raiseHand', raise: boolean): Promise<void>;
+    /**
+     * 举手相关操作-customMessage信令发送
+     * @param type 视频还是音频举手 audio/video
+     * @param raise 举手还是放下举手 true/false
+     */
+    raiseHandsByCustomMessage(type: 'audio' | 'video' | 'raiseHand', raise: boolean, userId: string): Promise<boolean>;
     /**
      * 主持人处理举手操作
-     * @param raiseHandsType 0 音视频 1 音频 2 视频 3 单纯的举手
+     * @param raiseHandsType 0 音视频 1 音频 2 视频 3 单纯的举手 4:通过sendCustomMessage去举手
      * @param raiseHands true 同意 false 拒绝
      * @param uid 指定的用户Id
      * @description 如果不指定用户ID就是广播处理所有的举手的人员
@@ -1721,7 +1761,7 @@ declare class BMRoom {
     chatVM: BMChatVM;
     bmStreamVm: BMStreamModelVM;
     observes: any;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     videoDevices: Device[];
     audioDevices: Device[];
     audioOutputDevices: Device[];
@@ -1763,10 +1803,7 @@ declare class BMRoom {
     audioDevicesWatcher: Subject<Device[]>;
     videoDevicesWatcher: Subject<Device[]>;
     audioOutputDevicesWatcher: Subject<Device[]>;
-    raiseHandleRespWatcher: Subject<{
-        raiseHandsType: 0 | 1 | 2 | 3;
-        raiseHands: boolean;
-    }>;
+    raiseHandleRespWatcher: Subject<RaiseHandsParams>;
     enableAudienceSpeakingWatcher: Subject<boolean>;
     deviceChangeWatcher: Subject<boolean>;
     mediaPermission: MediaPermission;
@@ -2420,7 +2457,7 @@ declare class BMRoom {
     queryBrtcStreams(uids: string[]): Promise<_hysc_brtc.RemoteStream[]>;
     handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
-    queryBloudUsers(uids: string[], forceUpdateSort?: boolean): Promise<void>;
+    queryBloudUsers(uids: string[], forceUpdateSort?: boolean, forceGetStream?: boolean): Promise<Map<string, BCClient.BCUser>>;
     getVersion(): string;
 }
 

package/dist/index.d.ts

@@ -1,7 +1,8 @@
+import * as BCClient from '@hysc/core';
+import BCClient__default, { ShareMediaOptions, Player, BCUser, AudioPlayer, SMConfig } from '@hysc/core';
 import * as lodash_es from 'lodash-es';
 import * as _hysc_brtc from '@hysc/brtc';
 import { LocalStream, RemoteStream, Device, SubscribeOptions, VideoProfile, AudioHint, StreamCodecOption } from '@hysc/brtc';
-import BCClient, { ShareMediaOptions, Player, BCUser, AudioPlayer, SMConfig } from '@hysc/core';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { BoomError } from '@hysc/utils';
 export { Logger } from '@hysc/utils';
@@ -28,6 +29,25 @@ declare type audioOffWatcherValue = {
     selfopenaudio: boolean;
 };
 
+/**
+ * @name: index.ts
+ * @author: yangliye
+ * @date: 2022-04-25 13:42
+ * @description：index.ts
+ * @update: 2022-04-25 13:42
+ */
+
+/** 举手相关操作 */
+interface RaiseHandsParams {
+    raiseHandsType: 0 | 1 | 2 | 3 | 4;
+    raiseHands: boolean;
+    raiseInfo?: {
+        userId: string;
+        raiseHandTime: number;
+        type: 'raiseHandsAudio' | 'raiseHandsVideo' | 'raiseHand';
+    };
+}
+
 /**
  * @name: BMSpeaker
  * @author: liuxinghai
@@ -123,12 +143,12 @@ declare class BMMessageInfo {
 
 declare class BMChatVM {
     messageList: Array<BMMessageInfo>;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     userVM: BMUserVM;
     bmRoom: BMRoom;
     messageListWatcher: BehaviorSubject<Array<BMMessageInfo>>;
     hasDangerMessageWatcher: Subject<boolean>;
-    constructor(boomCore: BCClient, userVM: BMUserVM, bmRoom: BMRoom);
+    constructor(boomCore: BCClient__default, userVM: BMUserVM, bmRoom: BMRoom);
     /**
      * 发送聊天消息
      * @param talkMsg 聊天信息
@@ -905,7 +925,7 @@ declare class BMUserVM {
     signalList: Map<string, BMUser>;
     /** 大房间,普通参会者列表 */
     commonUserList: Map<string, BMUser>;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     room: BMRoom;
     /** 嘉宾及以上列表 */
     userListWatcher: BehaviorSubject<BMUser[]>;
@@ -919,7 +939,7 @@ declare class BMUserVM {
     getForceUserWatcher: BehaviorSubject<boolean>;
     localUser: BMUser;
     commTimer: number;
-    constructor(boomCore: BCClient, localUser: BMUser, room: BMRoom);
+    constructor(boomCore: BCClient__default, localUser: BMUser, room: BMRoom);
     handleUserRoleChange(info: ChangeIsGuest): Promise<void>;
     /**
      * 添加用户, 并返回已添加的用户对象
@@ -1003,6 +1023,7 @@ declare class BMUserVM {
     private sortCommonUsers;
     private sortSignalUsers;
     private static filterUsers;
+    private static filterUser;
     /**
      * 排序变化之后的处理逻辑
      */
@@ -1036,6 +1057,19 @@ declare class BMUserVM {
         userList: BMUser[];
         total: number;
     }>;
+    /**
+     * 获取观众列表
+     * @param page
+     * @param pageSize
+     * @param mode
+     */
+    getAudiencesList(page: number, pageSize: number, mode?: 'map' | 'array'): Promise<{
+        userList: Map<string, BMUser>;
+        total: number;
+    } | {
+        userList: BMUser[];
+        total: number;
+    }>;
     getUsersList(page: number, pageSize: number, permission?: string, waitRoom?: boolean): Promise<{
         userList: BMUser[];
         total: number;
@@ -1356,13 +1390,13 @@ interface AudioProfileInfo {
 }
 declare class BMRoomVM {
     roomInfo: BMRoomInfo;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     userVM: BMUserVM;
     giveLikeListWatcher: Subject<Array<giveLikeItem>>;
     giveLikeList: Array<giveLikeItem>;
     private room;
     tipQueueObj: any;
-    constructor(boomCore: BCClient, userVM: any, roomInfo: BMRoomInfo);
+    constructor(boomCore: BCClient__default, userVM: any, roomInfo: BMRoomInfo);
     initWithRoom(room: BMRoom): void;
     /**
      * 踢出用户
@@ -1425,9 +1459,15 @@ declare class BMRoomVM {
      * @param raise 举手还是放下举手 true/false
      */
     raiseHands(type: 'audio' | 'video' | 'raiseHand', raise: boolean): Promise<void>;
+    /**
+     * 举手相关操作-customMessage信令发送
+     * @param type 视频还是音频举手 audio/video
+     * @param raise 举手还是放下举手 true/false
+     */
+    raiseHandsByCustomMessage(type: 'audio' | 'video' | 'raiseHand', raise: boolean, userId: string): Promise<boolean>;
     /**
      * 主持人处理举手操作
-     * @param raiseHandsType 0 音视频 1 音频 2 视频 3 单纯的举手
+     * @param raiseHandsType 0 音视频 1 音频 2 视频 3 单纯的举手 4:通过sendCustomMessage去举手
      * @param raiseHands true 同意 false 拒绝
      * @param uid 指定的用户Id
      * @description 如果不指定用户ID就是广播处理所有的举手的人员
@@ -1721,7 +1761,7 @@ declare class BMRoom {
     chatVM: BMChatVM;
     bmStreamVm: BMStreamModelVM;
     observes: any;
-    boomCore: BCClient;
+    boomCore: BCClient__default;
     videoDevices: Device[];
     audioDevices: Device[];
     audioOutputDevices: Device[];
@@ -1763,10 +1803,7 @@ declare class BMRoom {
     audioDevicesWatcher: Subject<Device[]>;
     videoDevicesWatcher: Subject<Device[]>;
     audioOutputDevicesWatcher: Subject<Device[]>;
-    raiseHandleRespWatcher: Subject<{
-        raiseHandsType: 0 | 1 | 2 | 3;
-        raiseHands: boolean;
-    }>;
+    raiseHandleRespWatcher: Subject<RaiseHandsParams>;
     enableAudienceSpeakingWatcher: Subject<boolean>;
     deviceChangeWatcher: Subject<boolean>;
     mediaPermission: MediaPermission;
@@ -2420,7 +2457,7 @@ declare class BMRoom {
     queryBrtcStreams(uids: string[]): Promise<_hysc_brtc.RemoteStream[]>;
     handleAddStreams(streams: SingleRemoteStream[]): void;
     getForceUser(forceId: string): Promise<void>;
-    queryBloudUsers(uids: string[], forceUpdateSort?: boolean): Promise<void>;
+    queryBloudUsers(uids: string[], forceUpdateSort?: boolean, forceGetStream?: boolean): Promise<Map<string, BCClient.BCUser>>;
     getVersion(): string;
 }