@rongcloud/plugin-call-plus 2.1.10-enterprise-lz.50 → 2.1.10

package/index.d.ts

@@ -1,5 +1,5 @@
-import { RCConnectionStatus, EventEmitter, BasicLogger, PluginContext, EnableLogL, IReceivedMessage, IPluginGenerator } from '@rongcloud/engine';
-import { RCRemoteTrack, RCTrack, ISubscribeAttr, RCRTCCode, RCLocalAudioTrack, RCRemoteAudioTrack, RCRTCClient, RCFrameRate, RCResolution } from '@rongcloud/plugin-rtc';
+import { RCConnectionStatus, EventEmitter, BasicLogger, PluginContext, IRuntime, EnableLogL, IReceivedMessage, IPluginGenerator } from '@rongcloud/engine';
+import { RCRemoteTrack, RCTrack, ISubscribeAttr, RCRTCCode, RCLocalAudioTrack, RCRemoteAudioTrack, RCRTCClient, RCRTCRoom, RCLocalTrack, IPublishAttrs, IPubSuccessRes, RCFrameRate, RCResolution } from '@rongcloud/plugin-rtc';
 export { RCFrameRate as RCCallPlusFrameRate, RCResolution as RCCallPlusResolution } from '@rongcloud/plugin-rtc';
 
 /**
@@ -413,11 +413,7 @@ declare enum RCCallPlusReason {
     /**
      * 远端用户的其他端已经在房间中，不允许 joinRoom 进行音视频通话
      */
-    REMOTE_OTHER_CLIENT_IN_RTC = 1214,
-    /**
-     * 加密通话失败，如获取秘钥失败等
-     */
-    ENCRYPT_FAILED = 1216
+    REMOTE_OTHER_CLIENT_IN_RTC = 1214
 }
 
 /**
@@ -475,10 +471,6 @@ interface IBaseSingalCon {
  * 开始呼叫信令内容
  */
 interface IStartCallCon {
-    /**
-     * 客户端生成，传给服务
-     */
-    callId?: string;
     /**
      * 用户生成 callId
      */
@@ -499,10 +491,6 @@ interface IStartCallCon {
      * 是否密聊
      */
     secretChat: SecretCallType;
-    /**
-     * 密钥
-     */
-    secretChatKey: string;
     /**
      * 当前用户的来源组 ID 类型
      */
@@ -527,16 +515,11 @@ interface IStartCallCon {
      * 附加信息，服务器透传
      */
     extra?: string;
-    innerExtra?: string;
 }
 /**
  * 单呼信令内容
  */
 interface IStartSingleCon {
-    /**
-     * 客户端生成，传递给服务
-     */
-    callId?: string;
     /**
      * 用户生成 callId
      */
@@ -582,16 +565,11 @@ interface IStartSingleCon {
      * 服务端接收的推送扩展
      */
     pushExt?: string;
-    innerExtra?: string;
 }
 /**
  * 群呼信令内容
  */
 interface IStartGroupCon {
-    /**
-     * 客户端生成，传递给服务
-     */
-    callId?: string;
     /**
      * 用户生成 callId
      */
@@ -628,16 +606,6 @@ interface IStartGroupCon {
      * 服务端接收的推送扩展
      */
     pushExt?: string;
-    innerExtra?: string;
-    /**
-     * 是否密聊(0: 否；1: 是)
-     * PC 目前无密聊，写死 0
-     */
-    secretChat: SecretCallType;
-    /**
-     * 单聊加密 key
-     */
-    secretChatKey?: string;
 }
 /**
  * 开始呼叫 Server 返回
@@ -674,7 +642,6 @@ interface IInviteCallCon extends IBaseSingalCon {
      * 服务端接收的推送扩展
      */
     pushExt?: string;
-    innerExtra?: string;
 }
 /**
  * 邀请好友加入信令结果
@@ -753,7 +720,7 @@ interface IPubInviteCon extends IBaseSingalCon {
     /**
      * 媒体类型
      */
-    mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
+    mediaType: RCCallPlusMediaType;
     /**
      * 是否密聊
      */
@@ -774,14 +741,6 @@ interface IPubInviteCon extends IBaseSingalCon {
      * 附加信息
      */
     extra?: string;
-    /**
-     * 可存储的扩展信息，由发起人发起时定义
-     */
-    innerExtra?: string;
-    /**
-     * 通话加密密钥
-     */
-    secretChatKey?: string;
 }
 /**
  * 通话响铃信令内容
@@ -1010,7 +969,6 @@ interface ISyncCallLogRes extends IBaseSingalCon {
      * 同步数据
      */
     syncTime: number;
-    innerExtra?: string;
 }
 interface ISyncCallLogResList {
     hasMore: 0 | 1;
@@ -1052,7 +1010,7 @@ interface ISignalTransporterListener {
     /**
      * 收到通话状态变更
      */
-    onStatusDown(data: IStatusDownCont, byServer: boolean, traceId: string): void;
+    onStatusDown(data: IStatusDownCont, traceId: string, sessionId?: string): void;
     /**
      * 其他端通话状态变更
      */
@@ -1084,7 +1042,7 @@ interface IGetUserCallStateListRes {
     callStateList: {
         callId: string;
         callType: RCCallPlusType;
-        mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
+        mediaType: RCCallPlusMediaType;
         /**
          * 呼叫发起者 ID
          */
@@ -1118,8 +1076,6 @@ interface IGetUserCallStateListRes {
          */
         targetId: string;
         startTime: number;
-        innerExtra?: string;
-        secretChat: SecretCallType;
     }[];
 }
 interface IClearCallLogRes {
@@ -1140,7 +1096,7 @@ interface IGetCallSessionServerRes extends IBaseSingalCon {
     /**
      * 媒体类型
      */
-    mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
+    mediaType: RCCallPlusMediaType;
     /**
      * 通话状态
      */
@@ -1169,9 +1125,6 @@ interface IGetCallSessionServerRes extends IBaseSingalCon {
      * 同步时间戳
      */
     syncTime: number;
-    innerExtra?: string;
-    secretChat: SecretCallType;
-    secretChatKey?: string;
 }
 interface IGetCallTimeInfoRes extends IBaseSingalCon {
     /**
@@ -1242,14 +1195,6 @@ interface ISessionUser {
      * 成员系统状态
      */
     systemState: RCCallPlusReason;
-    /**
-     * 摄像头是否可用
-     */
-    cameraEnable: boolean;
-    /**
-     * 麦克风是否可用
-     */
-    microphoneEnable: boolean;
     /**
      * 来源组 ID 类型
      */
@@ -1324,14 +1269,6 @@ interface IRCCallPlusCallRecord {
      * 创建时间
      */
     createTimestamp: number;
-    /**
-     * 同步数据
-     */
-    syncData?: string;
-    /**
-     * 是否为加密通话
-     */
-    isSecret: boolean;
 }
 interface IUserInfo {
     /**
@@ -1355,15 +1292,7 @@ interface IUserInfo {
      */
     orgId?: string;
 }
-interface IStartCallOpts {
-    /**
-     * 通话唯一 ID
-     */
-    callId?: string;
-    /**
-     * 客户端 callId
-     */
-    clientCallId: string;
+interface IStartCallOpts extends ICallId {
     /**
      * 被邀请人信息
      */
@@ -1375,7 +1304,7 @@ interface IStartCallOpts {
     /**
      * 通话媒体类型
      */
-    mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
+    mediaType: RCCallPlusMediaType;
     /**
      * 当前用户来源组 ID 类型
      */
@@ -1397,12 +1326,6 @@ interface IStartCallOpts {
      * 附加信息，服务器透传
      */
     extra?: string;
-    /**
-     * 内部透传信息，服务器会记录该数据
-     */
-    innerExtra?: string;
-    secretChat: SecretCallType;
-    secretChatKey?: string;
 }
 interface IStartCallResult {
     /**
@@ -1542,7 +1465,7 @@ interface IGetCallSessionRes extends ICallId {
     /**
      * 媒体类型
      */
-    mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
+    mediaType: RCCallPlusMediaType;
     /**
      * 通话状态
      */
@@ -1563,12 +1486,6 @@ interface IGetCallSessionRes extends ICallId {
      * 同步时间戳
      */
     syncTime: number;
-    innerExtra?: string;
-    secretChat: SecretCallType;
-    /**
-     * 通话加密密钥
-     */
-    secretChatKey?: string;
 }
 
 declare enum CallTimerEventType {
@@ -1613,17 +1530,8 @@ declare class RCCallInnerSession extends EventEmitter {
      */
     private _callUsers;
     private readonly _logger;
-    private readonly _isSecret;
-    /**
-     * 同步数据
-     */
-    private _syncData;
     /**
-     * 通话加密密钥
-     */
-    private _secretKey;
-    /**
-     * 暂存请求更新的 mediaType，无请求时为 null
+     * 请求更新的 mediaType
      */
     private _reqMediaType;
     /**
@@ -1664,7 +1572,7 @@ declare class RCCallInnerSession extends EventEmitter {
     /**
      * 通话媒体类型
      */
-    _mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO, 
+    _mediaType: RCCallPlusMediaType, 
     /**
      * session 呼叫发起者
      */
@@ -1676,15 +1584,7 @@ declare class RCCallInnerSession extends EventEmitter {
     /**
      * 当前 session 人员信息列表
      */
-    _callUsers: ISessionUser[], _logger: BasicLogger, _isSecret: boolean, 
-    /**
-     * 同步数据
-     */
-    _syncData?: string, 
-    /**
-     * 通话加密密钥
-     */
-    _secretKey?: string);
+    _callUsers: ISessionUser[], _logger: BasicLogger);
     /**
      * 获取 CallID
      */
@@ -1700,7 +1600,7 @@ declare class RCCallInnerSession extends EventEmitter {
     /**
      * 获取媒体类型
      */
-    getMediaType(): RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
+    getMediaType(): RCCallPlusMediaType;
     /**
      * 获取 session 发起者
      */
@@ -1716,7 +1616,7 @@ declare class RCCallInnerSession extends EventEmitter {
     /**
      * 请求更新的 mediaType
      */
-    getReqMediaType(): RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO | null;
+    getReqMediaType(): RCCallPlusMediaType | null;
     /**
      * inviterTimerId
      */
@@ -1726,7 +1626,6 @@ declare class RCCallInnerSession extends EventEmitter {
      */
     getInviteeTimerId(): number;
     getAllTimerIds(): number[];
-    setUserDeviceEnable(userId: string, mediaType: RCCallPlusMediaType, enable: boolean, traceId: string): void;
     /**
      * 更新人员列表, 并返回更新的人员列表
      * 根据人员状态去添加、删除、更新
@@ -1746,11 +1645,11 @@ declare class RCCallInnerSession extends EventEmitter {
     /**
      * 更新媒体类型（升降级）
      */
-    updateMediaType(mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO): void;
+    updateMediaType(mediaType: RCCallPlusMediaType): void;
     /**
      * 更新请求的媒体类型（升降级）
      */
-    updateReqMediaType(mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO | null): void;
+    updateReqMediaType(mediaType: RCCallPlusMediaType | null): void;
     /**
      * 更新 invter timer id
      */
@@ -1764,9 +1663,6 @@ declare class RCCallInnerSession extends EventEmitter {
      */
     setIsLocalClientHangup(isLocalClientHangup: boolean): void;
     getIsLocalClientHangup(): boolean;
-    getSyncData(): string | undefined;
-    isSecret(): boolean;
-    getSecretKey(): string;
 }
 
 declare enum CallServerAction {
@@ -2060,6 +1956,8 @@ declare class RCCallPlusReportModule {
 
 declare class SignalTransporter extends EventEmitter {
     private readonly _context;
+    private readonly _runtime;
+    private readonly _initOpts;
     private readonly _timeCorrectioner;
     private readonly _logger;
     private readonly _reportAppEventModule;
@@ -2075,7 +1973,7 @@ declare class SignalTransporter extends EventEmitter {
     /**
      * constructor
      */
-    constructor(_context: PluginContext, _timeCorrectioner: TimeCorrectioner, _logger: BasicLogger, _reportAppEventModule: RCCallPlusReportModule);
+    constructor(_context: PluginContext, _runtime: IRuntime, _initOpts: ICallPlusInitOpts, _timeCorrectioner: TimeCorrectioner, _logger: BasicLogger, _reportAppEventModule: RCCallPlusReportModule);
     private _onMessage;
     getSessionId(): string;
     getDeviceId(): string;
@@ -2207,7 +2105,7 @@ declare class SignalTransporter extends EventEmitter {
     /**
      * 补偿数据处理
      */
-    private _onCompensationData;
+    private _onConpensationData;
 }
 
 /**
@@ -2217,8 +2115,9 @@ declare class SignalTransporter extends EventEmitter {
  */
 declare class AbnormalCall {
     private readonly _logger;
+    private _localStore;
     private static _STORAGE_KEY;
-    constructor(_logger: BasicLogger);
+    constructor(runtime: IRuntime, _logger: BasicLogger);
     /**
      * 添加异常 callId
      */
@@ -2233,8 +2132,250 @@ declare class AbnormalCall {
     getAbnormalCallIds(userId: string): Promise<string[] | null>;
 }
 
+declare class RTCModule extends EventEmitter {
+    private readonly _context;
+    private readonly _runtime;
+    private readonly _initOpts;
+    private readonly _logger;
+    private readonly _callEngine;
+    private readonly _reportAppEventModule;
+    static __INNER_RTC_PROCESS_FAILED__: string;
+    static __INNER_RTC_PEERCONNECTION_ABNORMAL_CLOSE__: string;
+    static __INNER_ON_SELF_JOINED__: string;
+    static __INNER_ON_OTHER_JOINED__: string;
+    static __INNER_RECEIVE_FIRST_FRAME__: string;
+    static __INNER_ON_KICKOFF__: string;
+    /**
+     * RCRTC 实例
+     */
+    _rtcClient: RCRTCClient;
+    /**
+     * 己方的音视频 tracks
+     */
+    private _localTracks;
+    /**
+     * RCRTCRoom 实例
+     */
+    _room: RCRTCRoom | null;
+    private _callId;
+    private _callMediaType;
+    private _videoConfig;
+    private _audioConfig;
+    private _isPubTiny;
+    private _audioOutputDeviceId;
+    /**
+     * 视频配置是否变更
+     */
+    private _videoConfigIsChange;
+    /**
+     * 音频配置是否变更
+     */
+    private _audioConfigIsChange;
+    /**
+     * 存储设置的人员和视图
+     */
+    private _userViewMap;
+    private _callPlusStatusReportListener;
+    private _remoteAudioEnable;
+    constructor(_context: PluginContext, _runtime: IRuntime, _initOpts: ICallPlusInitOpts, _logger: BasicLogger, _callEngine: RCCallEngine, _reportAppEventModule: RCCallPlusReportModule);
+    setCallPlusStatusReportListener(listener: IStatusReportListener): void;
+    /**
+     * 取摄像头资源
+     * 内存中有时，返回内存中的视轨
+     */
+    getCameraVideoTrack(traceId: string): Promise<{
+        code: number;
+        track?: RCLocalTrack;
+    }>;
+    /**
+     * 取麦克风资源
+     * 内存中有时，返回内存中的音轨
+     */
+    getMicrophoneAudioTrack(traceId: string): Promise<{
+        code: number;
+        track?: RCLocalTrack;
+    }>;
+    /**
+     * 根据通话类型创建音、视频资源
+     * @param mediaType 音频或音视频
+     */
+    createCallMediaTracks(mediaType: RCCallPlusMediaType, traceId: string): Promise<{
+        code: number;
+    }>;
+    setVideoConfig(videoConfig: IVideoConfig): void;
+    setAudioConfig(audioConfig: IAudioConfig): void;
+    setAudioOutputDeviceId(deviceId: string): Promise<{
+        code: number;
+    }>;
+    destroyAllTracks(traceId: string): void;
+    setAllRemoteAudioEnable(enable: boolean, traceId: string): {
+        code: 80001;
+    } | {
+        code: 0;
+    };
+    destroyTrack(track: RCLocalTrack): Promise<void>;
+    /**
+     * session 连接
+     */
+    sessionConnected(callId: string, traceId: string): Promise<void>;
+    sessionClose(callId: string, traceId: string): Promise<void>;
+    /**
+     * 禁用视频 track
+     */
+    disableVideoTrack(): Promise<{
+        code: number | RCRTCCode;
+        track?: RCLocalTrack;
+    }>;
+    /**
+     * 启用视频track
+     * 1. 启用前应用层需先创建视频 track
+     */
+    enableVideoTrack(traceId: string): Promise<{
+        code: number | RCRTCCode;
+    }>;
+    /**
+     * 通话中切换视频设备
+     */
+    changeVideoDevice(traceId: string): Promise<{
+        code: number;
+        track?: RCLocalTrack;
+    }>;
+    /**
+     * 通话中更换音频设备
+     */
+    changeAudioDevice(traceId: string): Promise<{
+        code: number;
+    }>;
+    /**
+     * 禁用音频 track
+     */
+    disableAudioTrack(): Promise<{
+        code: number | RCRTCCode;
+        track?: RCLocalTrack;
+    }>;
+    /**
+     * 媒体类型升、降
+     */
+    changeMediaType(mediaType: RCCallPlusMediaType, traceId: string): Promise<void>;
+    /**
+     * 升级 音频 -> 音视频
+     * 1. 业务层需要先通过 createLocalTracks 创建本地视频 track
+     * 2. SDK 只处理发布视频 track
+     */
+    private _upgradeMediaType;
+    /**
+     * 降级处理
+     */
+    private _downgradeMediaType;
+    /**
+     * 加入 RTC 房间
+     */
+    joinRTCRoom(callId: string, traceId: string): Promise<{
+        code: number;
+        room?: RCRTCRoom;
+        tracks?: RCRemoteTrack[];
+    }>;
+    /**
+     * RTC 订阅
+     */
+    subscribeTracks(tracks: (ISubscribeAttr)[], traceId: string): Promise<{
+        code: number;
+    }>;
+    /**
+     * RTC 取消订阅
+     */
+    unsubscribeTracks(tracks: RCRemoteTrack[], traceId: string): Promise<{
+        code: number;
+    }>;
+    private _releaseStoredData;
+    getRemoteTracks(): {
+        [userId: string]: RCRemoteTrack[];
+    };
+    getRemoteTrack(userId: string, mediaType: RCCallPlusMediaType): RCRemoteTrack | undefined;
+    getRTCSessionId(): string | null;
+    /** ======私有方法============================================================================================= */
+    /**
+     * RTC 事件监听注册
+     */
+    private _regRTCListeners;
+    private _onLocalTrackReady;
+    private _onRemoteTrackReady;
+    private _onKickOff;
+    /**
+     * RTC Peer 异常关闭
+     * 移动端未处理此回调，定义 sysStatus 为 CONNECTION_ERR
+     */
+    private _onRTCPeerConnectionCloseByException;
+    private _onSelfJoined;
+    private _onRemoteTrackPublish;
+    private _onTrackUnpublish;
+    private _onAudioMuteChange;
+    private _onVideoMuteChagne;
+    private _onRTCStateReport;
+    /**
+   * RTC 接收最终失败后需要调用 hangup 挂断的情况
+   */
+    private _onRTCMethodFail;
+    private _onOtherMemJoined;
+    /**
+     * 创建本地音频 track, 创建成功后保存本地并回调通知
+     */
+    private _createAudioTrack;
+    /**
+     * 创建本地视频 track, 创建成功后保存本地并回调通知
+     */
+    private _createVideoTrack;
+    /**
+     * 获得本地缓存视频 track
+     */
+    getLocalVideoTrack(): RCLocalTrack | undefined;
+    /**
+     * 获得本地缓存音频 track
+     */
+    getLocalAudioTrack(): RCLocalTrack | undefined;
+    /**
+     * 发布本地资源的逻辑
+     */
+    publish(tracks: (RCLocalTrack | IPublishAttrs)[], traceId: string): Promise<{
+        code: number;
+    }>;
+    publishVideoTrack(): Promise<IPubSuccessRes>;
+    setVideoView(list: {
+        userId: string;
+        videoElement: HTMLVideoElement;
+        isTiny?: boolean;
+    }[], traceId: string): void;
+    /**
+     * 删除视图时，取消订阅资源
+     */
+    removeVideoView(userIds: string[], traceId: string): void;
+    /**
+     * 获取存储的人员和 video 元素数据
+     */
+    getUserViewMap(): {
+        [userId: string]: {
+            videoView: HTMLVideoElement;
+            isTiny: boolean;
+        };
+    };
+    /**
+     * 播放媒体资源
+     */
+    playMedia(userId: string, mediaType: RCCallPlusMediaType, videoView: HTMLVideoElement, traceId: string): Promise<{
+        code: 80104;
+    } | {
+        code: 80102;
+    } | {
+        code: RCRTCCode.PB_ERROR | RCRTCCode.SIGNAL_DISCONNECTED | RCRTCCode.PARAMS_ERROR | RCRTCCode.REPERT_JOIN_ROOM | RCRTCCode.NOT_IN_ROOM | RCRTCCode.SERVICE_INVALID | RCRTCCode.RTC_TOKEN_INVALID | RCRTCCode.SIGNAL_ERROR | RCRTCCode.CREATE_OFFER_FAILED | RCRTCCode.REQUEST_FAILED | RCRTCCode.MCU_SERVER_NOT_FOUND | RCRTCCode.BROADCAST_SUB_LIST_NOT_EMPTY | RCRTCCode.ROOM_HAS_BEEN_DESTROYED | RCRTCCode.NOT_OPEN_VIDEO_AUDIO_SERVER | RCRTCCode.GET_USER_MEDIA_FAILED | RCRTCCode.GET_DISPLAY_MEDIA_FAILED | RCRTCCode.BROWSER_PERMISSION_DENIED | RCRTCCode.CREATE_CUSTOM_TRACK_FAILED | RCRTCCode.INVALID_TAGS | RCRTCCode.INVALID_USER_ID | RCRTCCode.CREATE_FILE_TRACK_FAILED | RCRTCCode.INVALID_FILE_INSTANCE | RCRTCCode.SET_REMOTE_DESCRIPTION_FAILED | RCRTCCode.BROWSER_NOT_SUPPORT | RCRTCCode.TRACK_NOT_READY | RCRTCCode.VIDEO_TRACK_MISS_MEDIA_ELEMENT | RCRTCCode.TRACK_PLAY_ERROR | RCRTCCode.SIGNAL_AUDIENCE_JOIN_ROOM_FAILED | RCRTCCode.SIGNAL_ROOM_CHANGE_IDENTITY_FAILED | RCRTCCode.PACKAGE_ENVIRONMENT_ERROR | RCRTCCode.PUBLISH_TRACK_LIMIT_EXCEEDED | RCRTCCode.CDN_RESOURCE_IS_EMPTY | RCRTCCode.SIGNAL_JOIN_RTC_ROOM_REFUSED | RCRTCCode.NO_PERMISSION_TO_USE_REQUESTED_DEVICE | RCRTCCode.THE_FUNCTION_IS_DISABLED_IN_PKROOM | RCRTCCode.SOME_TRACKS_PUBLISH_FAILED | RCRTCCode.MAC_IN_ELECTRON_NOT_SUPPORT_SCREEN_SHARE_WITH_AUDIO | RCRTCCode.JWT_TIME_OUT | RCRTCCode.SYSTEM_PERMISSION_DENIED | RCRTCCode.PUBLISH_TRACKS_IS_INVALID | RCRTCCode.TRACK_READYSTATE_IS_ENDED | RCRTCCode.APPLY_3A_NOISE_WORKLET_BEFORE_PUBLISH | RCRTCCode.LOAD_3A_MODULE_FAILED;
+    } | {
+        code: 0;
+    }>;
+}
+
 declare class RCCallEngine extends EventEmitter {
     private readonly _context;
+    private readonly _runtime;
+    private readonly _initOpts;
     private readonly _logger;
     private readonly _reportAppEventModule;
     static __INNER_SESSION_CLOSE__: string;
@@ -2276,10 +2417,14 @@ declare class RCCallEngine extends EventEmitter {
      * client callId
      */
     private _clientCallId;
+    /**
+     * session 需使用 rtc 模块取设备状态
+     */
+    private _rtcModule;
     /**
      * 构造器
      */
-    constructor(_context: PluginContext, _logger: BasicLogger, _reportAppEventModule: RCCallPlusReportModule);
+    constructor(_context: PluginContext, _runtime: IRuntime, _initOpts: ICallPlusInitOpts, _logger: BasicLogger, _reportAppEventModule: RCCallPlusReportModule);
     /**
      * 发起呼叫
      */
@@ -2401,8 +2546,7 @@ declare class RCCallEngine extends EventEmitter {
      * 通知人员状态
      * CallClient 也需要更新人员状态，定义为公共函数
      */
-    updateUsersState(callId: string, users: ISessionUser[], traceId: string): void;
-    setUserDeviceEnable(userId: string, mediaType: RCCallPlusMediaType, enable: boolean, traceId: string): void;
+    updateUsersState(callId: string, users: ISessionUser[], traceId: string): ISessionUser[];
     /**
      * 获取通话开始时间
      */
@@ -2443,6 +2587,7 @@ declare class RCCallEngine extends EventEmitter {
     endCurrentUserAbnormalCalls(allDevice: boolean): Promise<{
         code: number;
     }>;
+    setRTCModule(rtcModule: RTCModule): void;
     /** ======私有方法============================================================================================= */
     /**
      * IM 状态变更处理
@@ -2528,7 +2673,7 @@ declare class RCCallEngine extends EventEmitter {
      * A2 多端在接听和直接加入 call 时，上报 onPhoneEnd 状态，消除 B 端展示的 onPhone 状态
      */
     private _clearMobileOnPhone;
-    private _onUserStateChange;
+    reportRemoteUserStateChange(callId: string, users: ISessionUser[], traceId: string): void;
     private _onOtherMemberInvite;
     private _onRequestChangeMediaType;
     private _receiveMediaTypeChangeResult;
@@ -2542,10 +2687,12 @@ declare class RCCallPlusSession {
     private readonly _session;
     private readonly _callEngine;
     private readonly _logger;
+    private readonly _rtcModule;
+    private readonly _context;
     private _startTime;
     private _duration;
     private _callId;
-    constructor(_session: RCCallInnerSession, _callEngine: RCCallEngine, _logger: BasicLogger);
+    constructor(_session: RCCallInnerSession, _callEngine: RCCallEngine, _logger: BasicLogger, _rtcModule: RTCModule, _context: PluginContext);
     /**
      * 获取 CallId
      */
@@ -2561,7 +2708,7 @@ declare class RCCallPlusSession {
     /**
      * 获取通话媒体类型
      */
-    getMediaType(): RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
+    getMediaType(): RCCallPlusMediaType;
     /**
      * 获取通话人员列表
      */
@@ -2593,20 +2740,6 @@ declare class RCCallPlusSession {
         code: number;
         duration?: number;
     }>;
-    /**
-     * 获取通话中的缓存数据，数据由通话发起人在发起通话时定义
-     * @returns
-     */
-    getSyncData(): string | undefined;
-    /**
-     * 通话是否已加密
-     * @returns
-     */
-    isSecret(): boolean;
-    /**
-     * 获取通话加密密钥
-     */
-    getSecretKey(): string;
 }
 
 /**
@@ -2707,6 +2840,10 @@ interface ICallPlusInitOpts {
      * 是否发布小流
      */
     isPubTiny?: boolean;
+    /**
+     * ring 状态下是否允许立即开始新通话，默认为 true
+     */
+    isAllowNewCallWhenRinging?: boolean;
 }
 /**
  * 通话记录的消息 content 字段
@@ -2744,75 +2881,12 @@ interface IRCCallPlusSummaryMessageContent {
      * 通话挂断原因
      */
     hangupReason: RCCallPlusReason;
-    /**
-     * 是否为加密通话
-     */
-    isSecret: boolean;
-    /**
-     * 通话发起人定义的同步信息
-     */
-    syncData?: string;
-    /**
-     * 是否是本人挂断
-     */
-    isSelfHangup: boolean;
 }
 /**
  * 通话记录的消息结构定义
  */
 interface IRCCallPlusReceivedSummaryMessage extends IReceivedMessage {
 }
-/**
- * 发起呼叫参数
- */
-interface IRCCallPlusStartParams {
-    /**
-     * callId，量子生成相同密钥时使用
-     */
-    callId?: string;
-    /**
-     * 被叫方通话用户列表
-     */
-    userIds: string[];
-    /**
-     * 通话类型，默认为 `RCCallPlusType.SINGLE`
-     * * `RCCallPlusType.SINGLE` - 发起单人呼叫
-     * * `RCCallPlusType.MULTI` - 发起多人呼叫
-     */
-    type?: RCCallPlusType;
-    /**
-     * 通话媒体类型，默认为 `RCCallPlusMediaType.AUDIO_VIDEO` 音视频通话
-     * * `RCCallPlusMediaType.AUDIO` - 音频通话
-     * * `RCCallPlusMediaType.AUDIO_VIDEO` - 音视频通话
-     */
-    mediaType: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO;
-    /**
-     * 推送配置，用于定义移动端接收呼叫时的推送行为
-     */
-    pushConfig?: IRCCallPlusPushConfig;
-    /**
-     * 透传信息，该信息将通过 `onReceivedCall` 回调时透传给被叫方
-     */
-    extra?: string;
-    /**
-     * 定义通话同步数据，该数据与 `extra` 不同点，在于数据会被服务器存储，同时可通过 `session.getSyncData()` 获取；
-     * 数据不可超出 1024 Bytes
-     */
-    syncData?: string;
-    /**
-     * 加密配置
-     */
-    encryption?: {
-        /**
-         * 是否加密，默认不加密
-         */
-        isSecret: boolean;
-        /**
-         * 密钥
-         */
-        secretKey: string;
-    };
-}
 /**
  * callPlus 对外事件定义
  */
@@ -3067,15 +3141,6 @@ interface IStatusReportListener {
     onReceivePacketLoss(data: {
         [userId: string]: RCCallPlusPacketLossStats;
     }): void;
-    /**
-     * 上报远端视频信息，每秒回调一次
-     * @param info.width 视频宽度
-     * @param info.height 视频高度
-     */
-    onReceiveRemoteVideoInfo?(info: {
-        width: number;
-        height: number;
-    }): void;
 }
 /**
  * 人员及人员状态
@@ -3327,8 +3392,11 @@ declare class RCCallPlusAndroidPushConfigBuilder {
     setimageUrlHonor(imageUrlHonor: string): this;
     /**
      * 构建 IAndroidPushConfig
+  <<<<<<< HEAD
+  =======
      * @returns IAndroidPushConfig 安卓推送配置数据
      * 返回值需传入 startCall、invite、hangup 方法的 pushConfig.androidConfig 中
+  >>>>>>> develop
      */
     build(): IAndroidPushConfig;
 }
@@ -3336,6 +3404,7 @@ declare class RCCallPlusAndroidPushConfigBuilder {
 declare class RCCallPlusClient {
     private readonly _context;
     private readonly _logger;
+    private readonly _runtime;
     private readonly _initOpts;
     /**
      * 摄像头采集配置
@@ -3367,7 +3436,7 @@ declare class RCCallPlusClient {
      * 上报应用层事件模块
      */
     _reportAppEventModule: RCCallPlusReportModule;
-    constructor(_context: PluginContext, _logger: BasicLogger, _initOpts: ICallPlusInitOpts);
+    constructor(_context: PluginContext, _logger: BasicLogger, _runtime: IRuntime, _initOpts: ICallPlusInitOpts);
     /**
      * 加房间、发布、订阅失败时需结束通话，并上报原因
      */
@@ -3392,10 +3461,6 @@ declare class RCCallPlusClient {
      * 被踢出房间时，需结束通话
      */
     private _kickoffHandle;
-    /**
-     * 远端资源音视频状态变化，需更新 session 中人员的设备状态
-     */
-    private _receiveDeviceEnableChangeHandle;
     /**
      * 通话挂断时，需清空内存，离开房间
      */
@@ -3444,12 +3509,9 @@ declare class RCCallPlusClient {
      * 播放某个人的视频前，请确保已经调用 `setVideoView` 方法为其设置视频视图
      * @param userId 指定要查看某个人的媒体资源
      * @param mediaType 指定播放音频还是视频
-     * @param volume 有效值为 0-100
      * @returns 返回是否播放成功
      */
-    playMedia(userId: string, mediaType: RCCallPlusMediaType, options?: {
-        volume?: number;
-    }): Promise<{
+    playMedia(userId: string, mediaType: RCCallPlusMediaType): Promise<{
         code: number;
     }>;
     /**
@@ -3494,23 +3556,14 @@ declare class RCCallPlusClient {
     }>;
     /**
      * 发起呼叫
-     * @deprecated 接口已废弃，请使用 `startCallWithParams` 接口替代
      * @param userIds 被叫人员 userId 列表，单人呼叫仅需在数组中放置对方一人的 userId
-     * @param callType 单人呼叫 or 多人呼叫
+     * @param type 单人呼叫 or 多人呼叫
      * @param mediaType 通话媒体类型: 音频 or 音视频
      * @param pushConfig 移动端推送信息
      * @param extra 附加信息，会透传给被呼叫方
      * @returns callId 呼叫成功后，产生的会话 id
      */
-    startCall(userIds: string[], callType?: RCCallPlusType, mediaType?: RCCallPlusMediaType.AUDIO | RCCallPlusMediaType.AUDIO_VIDEO, pushConfig?: IRCCallPlusPushConfig, extra?: string): Promise<{
-        code: number;
-        callId?: string;
-    }>;
-    /**
-     * 发起呼叫
-     * @param params - {@inheritDoc IRCCallPlusStartParams}
-     */
-    startCallWithParams(params: IRCCallPlusStartParams): Promise<{
+    startCall(userIds: string[], callType?: RCCallPlusType, mediaType?: RCCallPlusMediaType, pushConfig?: IRCCallPlusPushConfig, extra?: string): Promise<{
         code: number;
         callId?: string;
     }>;
@@ -3541,16 +3594,17 @@ declare class RCCallPlusClient {
     accept(callId: string, pushConfig?: IRCCallPlusPushConfig): Promise<{
         code: number;
     }>;
-    private _innerHangup;
+    private __innerHangup;
     /**
      * 挂断通话
-     * @param callId 可选参数；当存在多个通话时，可通过该参数指定要挂断的通话；不传时 SDK 将挂断当前进行中的通话；
+     * @param callId 为可选参数，不传时，挂断正在进行的主 session，传入时可指定挂断主通话或暂未建立连接的通话
+     * @param pushConfig 移动端推送信息
+     * 暂未建立连接的通话：指已在通话中时，收到呼叫但暂未接听的通话
      * @param pushConfig 移动端推送信息
      */
-    hangup(callId?: string, pushConfig?: IRCCallPlusPushConfig, reason?: RCCallPlusReason): Promise<{
+    hangup(callId?: string, pushConfig?: IRCCallPlusPushConfig): Promise<{
         code: number;
     }>;
-    private _hangup;
     /**
      * 通话中发起媒体类型变更请求
      * @param mediaType 媒体类型
@@ -3691,14 +3745,8 @@ declare class RCCallPlusClient {
     switchMicrophone(microphoneId: string): Promise<{
         code: number;
     }>;
-    /**
-     * 客户端生成 callId，量子特定，用于生成同样的密钥
-     * 呼叫时传给服务，通话 callId 为此 callId
-     * @param userId 用户 id
-     */
-    generateCallId(userId: string): string;
 }
 
 declare const installer: IPluginGenerator<RCCallPlusClient, ICallPlusInitOpts>;
 
-export { IAndroidPushConfig, IAudioConfig, IAudioConfigBuilder, ICallOpts, ICallPlusEventListener, ICallPlusInitOpts, IRCCallPlusCallRecord, IRCCallPlusGetCallRecordRes, IRCCallPlusPushConfig, IRCCallPlusReceivedSummaryMessage, IRCCallPlusStartParams, IRCCallPlusSummaryMessageContent, IServerPushExt, IStatusReportListener, IVideoConfig, IVideoConfigBuilder, IiOSPushConfig, RCAudioConfigBuilder, RCCallPlusAndroidPushConfigBuilder, RCCallPlusCallState, RCCallPlusCallUser, RCCallPlusClient, RCCallPlusCode, RCCallPlusMediaType, RCCallPlusMediaTypeChangeResult, RCCallPlusPacketLossStats, RCCallPlusReason, RCCallPlusSession, RCCallPlusSessionUserState, RCCallPlusType, RCVideoConfigBuilder, installer };
+export { IAndroidPushConfig, IAudioConfig, IAudioConfigBuilder, ICallOpts, ICallPlusEventListener, ICallPlusInitOpts, IRCCallPlusCallRecord, IRCCallPlusGetCallRecordRes, IRCCallPlusPushConfig, IRCCallPlusReceivedSummaryMessage, IRCCallPlusSummaryMessageContent, IServerPushExt, IStatusReportListener, IVideoConfig, IVideoConfigBuilder, IiOSPushConfig, RCAudioConfigBuilder, RCCallPlusAndroidPushConfigBuilder, RCCallPlusCallState, RCCallPlusCallUser, RCCallPlusClient, RCCallPlusCode, RCCallPlusMediaType, RCCallPlusMediaTypeChangeResult, RCCallPlusPacketLossStats, RCCallPlusReason, RCCallPlusSession, RCCallPlusSessionUserState, RCCallPlusType, RCVideoConfigBuilder, installer };