@hysc/meeting 2.6.60 → 2.6.61

package/umd/BMRoom/BMRoom.d.ts

@@ -1,4 +1,5 @@
 import BoomCore from '@hysc/core';
+import { MessageType } from './attachEvents';
 import BMRoomVM, { AudioProfileInfo } from "./BMRoomVM";
 import BMUserVM from '../BMUser/BMUserVM';
 import { SingleLocalStream, SingleRemoteStream, SingleRemoteStreamOption, SubscribeOptions } from '../type';
@@ -13,6 +14,7 @@ import BMLiveVM from './BMLiveVM';
 interface BMRoomProps {
     initDevices: boolean;
 }
+export declare let _selfSortType: number;
 export default class BMRoom {
     roomVM: BMRoomVM | null;
     userVM: BMUserVM;
@@ -26,6 +28,15 @@ export default class BMRoom {
     selectVideoDevice: Device | null;
     selectAudioDevice: Device | null;
     selectAudioOutputDevice: Device | null;
+    /**
+     * 这个参数是和业务相关的功能，业务上的参会者列表是可以配置的，如果设置了只展示一列，那么所有的用户都要存储
+     * 在commonUserList中
+     */
+    userListColumns: number;
+    /**
+     * 排序规则 1 是标品排序， 2 是中移排序
+     */
+    sortType: number;
     /**
      * brtc断网重连的时候,所有的订阅和播放相关的处理,都不需要
      */
@@ -47,12 +58,12 @@ export default class BMRoom {
     videoDevicesWatcher: Subject<Device[]>;
     audioOutputDevicesWatcher: Subject<Device[]>;
     raiseHandleRespWatcher: Subject<{
-        raiseHandsType: 0 | 1 | 2 | 3;
+        raiseHandsType: 0 | 1 | 2;
         raiseHands: boolean;
     }>;
     enableAudienceSpeakingWatcher: Subject<boolean>;
     videoProfile: VideoProfile;
-    audioProfile: AudioProfileInfo | null;
+    private audioProfile;
     /**
      * brtc断网重连要给端上事件响应，所有端上把流单独做处理的，需要在收到这个事件之后，重新处理所有的effect
      */
@@ -68,7 +79,10 @@ export default class BMRoom {
     /**
      * 传递信息用的，主要是用于message信令往上层业务发送消息
      */
-    messageWatcher: BehaviorSubject<any>;
+    messageWatcher: BehaviorSubject<{
+        type: MessageType;
+        status: boolean;
+    }>;
     roomInfo: BMRoomInfo;
     localUser: BMUser;
     bmLiveVM: BMLiveVM;
@@ -89,6 +103,8 @@ export default class BMRoom {
      * @param profile 设置视频分辨率
      */
     setVideoProfile(profile: VideoProfile): void;
+    setUserListColumns(column: number): void;
+    setSortType(type: number): void;
     /**
      * 设置声音增益的属性，回音消除 音频降噪 声音增益等
      * @param audioProfile
@@ -212,9 +228,8 @@ export default class BMRoom {
      * 开关对端麦克风(现在还不知道怎么实现, 未找到实现逻辑)
      * @param status true:开,false:关
      * @param uid 用户id
-     * @param isNotCancelRootReport 当打开麦克风时, 是否不取消音频权限申请
      */
-    setRemoteAudioEnable(status: boolean, uid: string, isNotCancelRootReport: boolean | undefined): Promise<void>;
+    setRemoteAudioEnable(status: boolean, uid: string): Promise<void>;
     /**
      * 开关本地摄像头
      * @param status true:开,false:关
@@ -501,7 +516,7 @@ export default class BMRoom {
      * 发送聊天室消息
      * @param msg
      */
-    sendChatMessage(msg: string, userId: string | undefined, lostNet: boolean): Promise<any>;
+    sendChatMessage(msg: string, userId: string | undefined): Promise<any>;
     /**
      * 获取聊天室消息
      */

package/umd/BMRoom/BMRoomInfo.d.ts

@@ -77,10 +77,6 @@ interface OperationCustomStats {
      * 是否允许开启虚拟背景 0全员 1嘉宾 2主持人
      */
     backgroundAIEnable: 0 | 1 | 2;
-    /**
-     * 是否允许举手 0禁止全员 1允许嘉宾 2全员可举手
-     */
-    raiseHandEnable: 0 | 1 | 2;
 }
 export default class BMRoomInfo {
     private room;
@@ -135,11 +131,6 @@ export default class BMRoomInfo {
      */
     private raiseVideoHandsList;
     raiseVideoHandsWatcher: BehaviorSubject<BMUser[]>;
-    /**
-    * 所有的举手的人员
-    */
-    private raiseSimpleHandsList;
-    raiseSimpleHandsWatcher: BehaviorSubject<BMUser[]>;
     operationPermission: OperationCustomStats | undefined;
     operationPermissionWatcher: Subject<OperationCustomStats>;
     chatNoticeWatcher: Subject<unknown>;
@@ -183,27 +174,16 @@ export default class BMRoomInfo {
      */
     removeRaiseHandUser(user: BMUser): void;
     /**
-     * 视频申请处理
+     * 视频举手处理
      * @param user
      */
     addVideoRaiseHandUser(user: BMUser): void;
     /**
-     * 取消视频申请处理
+     * 取消视频举手处理
      * @param user
      */
     removeVideoRaiseHandUser(user: BMUser): void;
-    /**
-     * 举手处理
-     * @param user
-     */
-    addSimpleRaiseHandUser(user: BMUser): void;
-    /**
-     * 取消举手处理
-     * @param user
-     */
-    removeSimpleRaiseHandUser(user: BMUser): void;
     private setRaiseHandsWatcherValue;
     private setVideoRaiseHandsWatcherValue;
-    private setSimpleRaiseHandsWatcherValue;
 }
 export {};

package/umd/BMRoom/BMRoomVM.d.ts

@@ -12,7 +12,6 @@ declare type giveLikeItem = {
     userId: string | undefined;
     nickName: string | undefined;
     time: number;
-    type: number;
 };
 export declare type CloudRecord = {
     recordStatus: 0 | 1 | 2;
@@ -60,10 +59,6 @@ export interface AudioProfileInfo {
      * 调整扬声器音量 0 - 100
      */
     speakerVolume?: number;
-    /**
-     * 调整麦克风音量 0 - 100
-     */
-    microVolume?: number;
 }
 export default class BMRoomVM {
     roomInfo: BMRoomInfo;
@@ -110,9 +105,8 @@ export default class BMRoomVM {
      * 开关对端麦克风-信令发送
      * @param status true:开,false:关
      * @param uid 用户id
-     * @param isNotCancelRootReport 当打开麦克风时, 是否不取消音频权限申请
      */
-    setRemoteAudioEnable(status: boolean, uid: string, isNotCancelRootReport: boolean | undefined): Promise<void>;
+    setRemoteAudioEnable(status: boolean, uid: string): Promise<void>;
     /**
      * 开关对端摄像头-信令发送
      * @param status true:开,false:关
@@ -135,15 +129,15 @@ export default class BMRoomVM {
      * @param type 视频还是音频举手 audio/video
      * @param raise 举手还是放下举手 true/false
      */
-    raiseHands(type: 'audio' | 'video' | 'raiseHand', raise: boolean): Promise<void>;
+    raiseHands(type: 'audio' | 'video', raise: boolean): Promise<void>;
     /**
      * 主持人处理举手操作
-     * @param raiseHandsType 0 音视频 1 音频 2 视频 3 单纯的举手
+     * @param raiseHandsType 0 音视频 1 音频 2 视频
      * @param raiseHands true 同意 false 拒绝
      * @param uid 指定的用户Id
      * @description 如果不指定用户ID就是广播处理所有的举手的人员
      */
-    handleRaiseHands(raiseHandsType: 0 | 1 | 2 | 3, raiseHands: boolean, uid?: string): Promise<undefined>;
+    handleRaiseHands(raiseHandsType: 0 | 1 | 2, raiseHands: boolean, uid?: string): Promise<undefined>;
     /**
      * 更新自定义属性 updateCustomStats
      * @param stats
@@ -161,10 +155,9 @@ export default class BMRoomVM {
      */
     giveLikeEnable(enable: 0 | 1): Promise<void>;
     /**
-     * 观众点赞(走customMessage)
-     * @param type 1:点赞, 2:送花, 3:爱心, 4: 鼓掌, 5: 喝彩
+     * 观众点赞(走sendMessage)
      */
-    userGiveLike(type: 1 | 2 | 3 | 4 | 5): Promise<void>;
+    userGiveLike(): Promise<void>;
     /**
      * 聊天是否可用
      * @param enable 0 不允许 1 允许  2仅主持人 3嘉宾
@@ -221,11 +214,6 @@ export default class BMRoomVM {
     */
     recordEnable(enable: 0 | 1 | 2): Promise<void>;
     /**
-   * 是否全员可录制
-   * @param enable 0禁止全员举手 1嘉宾可举手 2全员可举手
-   */
-    raiseHandEnable(enable: 0 | 1 | 2): Promise<void>;
-    /**
     * 入会麦克风禁用
     * @param enable 0全员禁止使用 1嘉宾和学员不可使用 2不开启
     */
@@ -279,7 +267,7 @@ export default class BMRoomVM {
      * @param {boolean} status 设置是否成功
      * @param {string} userId
      */
-    resp2ChangeRemoteVideoProfile(status: boolean, userId: string, profile: string): Promise<any>;
+    resp2ChangeRemoteVideoProfile(status: boolean, userId: string): Promise<any>;
     /**
      * 调节远端的音频参数
      * @param {Object} profileInfo

package/umd/BMRoom/attachEvents.d.ts

@@ -1,7 +1,6 @@
 import BoomCore from '@hysc/core/esm';
 import BMStreamModelVM from "../BMStream/BMStreamModelVM";
 import BMRoom from './BMRoom';
-import { SingleRemoteStream } from '../type';
 import BMUserVM from "../BMUser/BMUserVM";
 import BMChatVM from '../BMChat/BMChatVM';
 import BMStreamModel from "../BMStream/BMStreamModel";
@@ -23,7 +22,6 @@ export declare enum MessageType {
      */
     AUDIO_FORCE_CHANGE = "audio-force-change"
 }
-export declare function getStreamFromBrtcStreamMap(remoteStream: SingleRemoteStream): import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default | undefined;
 export declare function attachBRTCEvent(boomCore: BoomCore, bmStreamVm: BMStreamModelVM, userVM: BMUserVM): void;
 export declare function attachEvents(boomCore: BoomCore, userVM: BMUserVM, bmStreamVm: BMStreamModelVM, chatVM: BMChatVM, bmRoom: BMRoom): any;
 export declare function checkStreamIsNormal(streamModel: BMStreamModel | undefined): void;

package/umd/BMStream/BMStreamModel.d.ts

@@ -1,7 +1,6 @@
 import { SingleStream, SubscribeOptions } from '../type';
 import BMUser from '../BMUser/BMUser';
 import { BehaviorSubject, Subject } from 'rxjs';
-import BMStreamModelVM from "./BMStreamModelVM";
 /**
  * @name: BMStreamModel
  * @author: yangliye
@@ -127,9 +126,8 @@ export default class BMStreamModel {
      * 更新当前streamModel中的流
      * @param stream
      * @param needReProcess
-     * @param bmStreamVm
      */
-    updateStream(stream: SingleStream | undefined, needReProcess: boolean | undefined, bmStreamVm: BMStreamModelVM): void;
+    updateStream(stream: SingleStream | undefined, needReProcess?: boolean): void;
     private onPlayerStateChange;
     handleStreamConnectError: () => void;
     /**
@@ -187,6 +185,14 @@ export default class BMStreamModel {
     sendMessage2Room: any;
     emitBindElement: any;
     emitBindBigElement: any;
+    /**
+     * 判断当前是不是正在小窗口播放
+     */
+    currentIsPlaying: () => boolean;
+    /**
+     * 判断当前是不是正在小窗口播放
+     */
+    currentBigIsPlaying: () => boolean | null | undefined;
     /**
      * 播放当前流
      */

package/umd/BMStream/BMStreamModelVM.d.ts

@@ -23,7 +23,6 @@ import { Device } from '@hysc/core/esm/BoomAdapter/type/value';
 import BMSpeaker from './BMSpeaker';
 import { ShareMediaOptions } from "@hysc/core/esm/BoomCore/BCClient/BCClient";
 import { getHTMLMediaStreamOptions, Result, getMediaStreamInfo } from "./getHTMLMediaStreamOptions";
-export declare function transShareScreen2User(userId: string): string;
 export declare const pubFailedStreamMap: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
 /**
  * 全量的brtc流记录，把所有brtc用户推的流都做记录
@@ -37,13 +36,13 @@ export declare const BRTCStreamMap: Map<string, import("@hysc/core/esm/BoomAdapt
 export declare const BRTCShareStreamMap: Map<string, import("@hysc/core/esm/BoomAdapter/singleMode/stream/RemoteStream").default>;
 export default class BMStreamModelVM {
     streamModels: Map<string, BMStreamModel>;
+    sendStreamModels: BMStreamModel[];
     /**
      * 因为投屏码用户进来以后，他是不在小窗口展示的，所以要把投屏的用户过滤掉给业务的展示
      */
     streamModelsWatcher: BehaviorSubject<BMStreamModel[]>;
     shareStreamModels: Map<string, BMStreamModel>;
     shareStreamModelsWatcher: BehaviorSubject<BMStreamModel[]>;
-    localStreamErrorWatcher: Subject<boolean>;
     localModel: BMStreamModel | null;
     private room;
     bloudStream: any;
@@ -109,7 +108,7 @@ export default class BMStreamModelVM {
      * @returns
      */
     remoteStreamUnpublished(stream: SingleRemoteStream): BMStreamModel | undefined;
-    sortStreamModels(): BMStreamModel[];
+    sortStreamModels(): void;
     updateStreamModel(streamModel: BMStreamModel, stream: SingleStream): void;
     updateShareStreamModel(streamModel: BMStreamModel, stream: SingleStream): void;
     /**
@@ -155,7 +154,7 @@ export default class BMStreamModelVM {
      * @private
      */
     private createStreamAndPublish;
-    videoMuteHandler(type: 'video' | 'audio'): Promise<void>;
+    videoMuteHandler(): Promise<void>;
     /**
      * 更改音视频状态或者取消发布
      * @param type 更改类型

package/umd/BMUser/BMUser.d.ts

@@ -1,8 +1,8 @@
 import BMStreamModel from '../BMStream/BMStreamModel';
 import { BehaviorSubject } from 'rxjs';
 import BCUser from '@hysc/core/esm/BoomAdapter/User/User';
-import BMRoom from '../BMRoom/BMRoom';
-declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'getGuest' | 'removeGuest' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking' | 'inBackground' | 'raiseHand' | 'audienceEnableSpeaking';
+import BMRoom from "../BMRoom/BMRoom";
+declare type Operation = 'none' | 'getMaster' | 'getManager' | 'removeMaster' | 'getGuest' | 'removeGuest' | 'removeManager' | 'changeNickName' | 'speakerEnable' | 'changeShare' | 'updateUser' | 'raiseHandsVideo' | 'raiseHandsAudio' | 'audienceEnableSpeaking' | 'inBackground';
 interface IUserActionWatcher {
     operation: Operation;
     user: BMUser;
@@ -19,7 +19,7 @@ interface UserInfo {
     };
 }
 export interface RaiseHandInfo {
-    status: 'raiseHandsAudio' | 'raiseHandsVideo' | 'raiseHand';
+    status: 'raiseHandsAudio' | 'raiseHandsVideo';
     user: BMUser;
 }
 export default class BMUser {
@@ -57,7 +57,6 @@ export default class BMUser {
      * 'changeShare': 是否在屏幕共享
      * 'raiseHandsVideo': 是否视频举手
      * 'raiseHandsAudio': 是否音频举手
-     * 'raiseHand':单纯的举手
      * @property {BMUser} user
      */
     watcher: BehaviorSubject<IUserActionWatcher>;
@@ -70,7 +69,6 @@ export default class BMUser {
      */
     raiseVideoHands: boolean;
     raiseAudioHands: boolean;
-    raiseHand: boolean;
     isAudience: boolean;
     /**
      * 是不是普通参会者
@@ -80,7 +78,6 @@ export default class BMUser {
      * 如果改用户是移动端, 该值用于判断这个用户是否在后台
      */
     inBackground: boolean;
-    raiseHandTime: number;
     /**
      * 是不是web端入会
      */
@@ -88,6 +85,7 @@ export default class BMUser {
     constructor(user: any, isLocal?: boolean);
     setup(userId: string, userinfo: UserInfo, nickname: string): void;
     getMainStreamModel(): BMStreamModel | undefined;
+    get nickname(): string;
     getShareStreamModel(): BMStreamModel | undefined;
     /**
      * 获取用户麦克风开启状态
@@ -150,6 +148,6 @@ export default class BMUser {
      * 更新当前用户的排序
      */
     updateSortNum(): void;
-    updateSort(): void;
+    setSortNum(sortNum: number): void;
 }
 export {};

package/umd/BMUser/BMUserVM.d.ts

@@ -128,13 +128,4 @@ export default class BMUserVM {
     }>;
     getTotalUserNumber(): Promise<number>;
     clearUsers(): void;
-    /**
-   * 参会者列表搜索(嘉宾及以上才能搜索)
-   * @param searchTxt 搜索文本
-   * @param pageSize 一页几个
-   */
-    searchUsers(searchTxt: string, pageSize: number): Promise<{
-        userList: BMUser[];
-        commonUserList: BMUser[];
-    }>;
 }

package/umd/constants.d.ts

@@ -6,9 +6,9 @@
  * @update: 2022-04-27 10:39
  */
 /**
- * 窗口排序常量
+ * 标品排序规则
  */
-export declare enum MODEL_SORT_ENUM {
+export declare enum MODEL_SORT_ENUM_STAND {
     SCREEN = 0,
     MASTER = 1,
     LOCAL = 2,
@@ -16,14 +16,37 @@ export declare enum MODEL_SORT_ENUM {
     MANAGER_AUDIO = 4,
     MANAGER_VIDEO = 5,
     MANAGER = 6,
-    RAISE_HAND = 7,
-    RAISE_AUDIO = 8,
-    RAISE_VIDEO = 9,
-    AUDIO_VIDEO = 10,
-    AUDIO = 11,
-    SIGNAL = 12,
-    VIDEO = 13,
-    OTHER = 14
+    RAISE_AUDIO = 7,
+    RAISE_VIDEO = 8,
+    AUDIO_VIDEO = 9,
+    AUDIO = 10,
+    SIGNAL = 11,
+    VIDEO = 12,
+    OTHER = 13
+}
+/**
+ * 中移排序规则
+ */
+export declare enum MODEL_SORT_ENUM_ZY {
+    SCREEN = 0,
+    RAISE_AUDIO = 1,
+    RAISE_VIDEO = 2,
+    LOCAL = 3,
+    MASTER_AUDIO_VIDEO = 4,
+    MANAGER_AUDIO_VIDEO = 5,
+    AUDIO_VIDEO = 6,
+    MASTER_AUDIO = 7,
+    MANAGER_AUDIO = 8,
+    AUDIO = 9,
+    MASTER_VIDEO = 10,
+    MANAGER_VIDEO = 11,
+    VIDEO = 12,
+    MASTER = 13,
+    MANAGER = 14,
+    GUEST = 15,
+    COMMON_USER = 16,
+    SIGNAL = 17,
+    OTHER = 18
 }
 export declare enum STREAM_TYPE {
     /**