解决merge

2022-06-11 11:28:48 +08:00
parent f0285c99aa 2b47c91313
commit cf2d6370ca
117 changed files with 19519 additions and 13458 deletions
--- a/uni_modules/RongCloud-CallWrapper/changelog.md
+++ b/uni_modules/RongCloud-CallWrapper/changelog.md
@@ -1,12 +0,0 @@
-## 5.1.15（2022-01-10）
-* 更新 SDK
-## 1.0.4（2022-01-06）
-* 修复初始化问题
-## 1.0.3（2022-01-06）
-* 更新插件内容
-## 1.0.2（2022-01-06）
-* 添加枚举值
-## 1.0.1（2022-01-05）
-* 更新目录结构
-## 1.0.0（2022-01-05）
-* 支持 Calllib JS 层
--- a/uni_modules/RongCloud-CallWrapper/lib/index.d.ts
+++ b/uni_modules/RongCloud-CallWrapper/lib/index.d.ts
@@ -1,377 +0,0 @@
-/*
- * RCCallUni - v5.1.14-release.1
- * CommitId - a184e82065a309fc565be987321c44e9da02abbb
- * Thu Jan 06 2022 16:03:36 GMT+0800 (中国标准时间)
- * ©2020 RongCloud, Inc. All rights reserved.
- */
-declare enum RCCallIWCamera {
-    NONE = -1,
-    FRONT = 0,
-    BACK = 1
-}
-/**
- * 通话媒体类型
- */
-declare enum RCCallIWMediaType {
-    /**
-     * 音频通话
-     */
-    AUDIO = 0,
-    /**
-     * 视频通话
-     */
-    AUDIO_VIDEO = 1
-}
-declare enum RCUNICallErrorCode {
-    SUCCESS = 0,
-    ENGINE_NOT_FOUND = 1,
-    NETWORK_UNAVAILABLE = 2,
-    ONE_CALL_EXISTED = 3,
-    OPERATION_UNAVAILABLE = 4,
-    INVALID_PARAM = 5,
-    NETWORK_UNSTABLE = 6,
-    MEDIA_REQUEST_FAILED = 7,
-    MEDIA_SERVER_NOT_READY = 8,
-    MEDIA_SERVER_NOT_INITIALIZED = 9,
-    MEDIA_REQUEST_TIMEOUT = 10,
-    MEDIA_UNKOWN_ERROR = 11,
-    MEDIA_KICKED_BY_SERVER_ERROR = 12,
-    MEDIA_SERVER_CLOSED_ERROR = 13,
-    MEDIA_SERVER_PUBLISH_ERROR = 14,
-    MEDIA_SERVER_SUBSCRIBE_ERROR = 15,
-    MEDIA_JOIN_ROOM_REFUSE_ERROR = 16
-}
-declare enum RCCallIWCallDisconnectedReason {
-    CANCEL = 0,
-    REJECT = 1,
-    HANGUP = 2,
-    BUSY_LINE = 3,
-    NO_RESPONSE = 4,
-    ENGINE_UNSUPPORTED = 5,
-    NETWORK_ERROR = 6,
-    RESOURCE_GET_ERROR = 7,
-    RESOURCE_PUBLISH_ERROR = 8,
-    RESOURCE_SUBSCRIBE_ERROR = 9,
-    REMOTE_CANCEL = 10,
-    REMOTE_REJECT = 11,
-    REMOTE_HANGUP = 12,
-    REMOTE_BUSY_LINE = 13,
-    REMOTE_NO_RESPONSE = 14,
-    REMOTE_ENGINE_UNSUPPORTED = 15,
-    REMOTE_NETWORK_ERROR = 16,
-    REMOTE_RESOURCE_GET_ERROR = 17,
-    REMOTE_RESOURCE_PUBLISH_ERROR = 18,
-    REMOTE_RESOURCE_SUBSCRIBE_ERROR = 19,
-    KICKED_BY_OTHER_CALL = 20,
-    IN_OTHER_CALL = 21,
-    KICKED_BY_SERVER = 22,
-    REMOTE_KICKED_BY_OTHER_CALL = 23,
-    REMOTE_IN_OTHER_CALL = 24,
-    REMOTE_KICKED_BY_SERVER = 25,
-    ACCEPT_BY_OTHER_CLIENT = 26,
-    HANGUP_BY_OTHER_CLIENT = 27,
-    REJECTED_BY_BLACKLIST = 28,
-    SERVICE_NOT_OPENED = 29,
-    DROP_TO_OBSERVER = 30,
-    INIT_VIDEO_ERROR = 31,
-    OTHER_DEVICE_HAD_ACCEPTED = 32,
-    SERVICE_DISCONNECTED = 33
-}
-declare enum RCCallIWBeautyFilterType {
-    NONE = 0,
-    ESTHETIC = 1,
-    FRESH = 2,
-    ROMANTIC = 3
-}
-
-interface UniListenerResult<T> {
-    module: string;
-    type: string;
-    data: T;
-}
-interface usersParams {
-    userId: string;
-    mediaType: string;
-    enableCamera: string;
-    userType: string;
-    enableMicrophone: string;
-    mediaId?: string;
-}
-interface ReceivedListenerResult {
-    mine: usersParams;
-    inviter: usersParams;
-    startTime: number;
-    caller: usersParams;
-    mediaType: number;
-    callType: number;
-    endTime: number;
-    extra: string;
-    targetId: string;
-    connectedTime: number;
-    users: usersParams[];
-    callId: string;
-}
-interface ListenerResultRes {
-    reason?: RCCallIWCallDisconnectedReason;
-}
-interface ListenerResultError {
-    reason?: RCUNICallErrorCode;
-}
-interface ListenerResultData {
-    userId?: string;
-    user?: usersParams;
-    mediaType?: string;
-}
-interface RCCallIWBeautyOption {
-    whitenessLevel: number;
-    smoothLevel: number;
-    ruddyLevel: number;
-    brightLevel: number;
-}
-
-/**
-* 初始化 SDK，只需要调用一次
-*
-* calllib初始化默认不传参数
-*/
-declare function init(): void;
-/**
-* 注销calllib
-*
-* 注销calllib默认不传参数
-*/
-declare function unInit(): void;
-/**
-* 添加接收监听函数
-*
-* @param listener 回调函数
-*/
-declare function onCallReceived(listener: (result: UniListenerResult<ReceivedListenerResult>) => void): void;
-/**
-* 添加挂断监听函数
-*
-* @param listener 回调函数
-*/
-declare function onCallDisconnected(listener: (result: UniListenerResult<ListenerResultRes>) => void): void;
-/**
-* 添加连接监听函数
-*
-* @param listener 回调函数
-*/
-declare function onCallConnected(listener: (result: UniListenerResult<ListenerResultRes>) => void): void;
-/**
-* 通话中的某一个参与者，邀请好友加入通话
-*
-* @param listener 回调函数
-*/
-declare function onRemoteUserInvited(listener: (result: UniListenerResult<ListenerResultRes>) => void): void;
-/**
- * 对端用户加入了通话
- * @param listener 回调函数
- */
-declare function onRemoteUserJoined(listener: (result: UniListenerResult<usersParams>) => void): void;
-/**
- * 对端用户挂断 (实际测试，只在群聊时用触发)
- * @param listener 回调函数
- */
-declare function onRemoteUserLeft(listener: (result: UniListenerResult<ListenerResultRes>) => void): void;
-/**
- * 电话已拨出 主叫端拨出电话后，通过回调 onCallOutgoing 通知当前 call 的详细信息
- * @param listener 回调函数
- */
-declare function onCallOutgoing(listener: (result: UniListenerResult<ListenerResultRes>) => void): void;
-/**
- * 被叫端正在振铃，主叫端拨出电话，被叫端收到请求，发出振铃响应时监听
- * @param listener 回调函数
- */
-declare function onRemoteUserRinging(listener: (result: UniListenerResult<ListenerResultRes>) => void): void;
-/**
- * 通话出现错误的回调
- * @param listener 回调函数
- */
-declare function onError(listener: (result: UniListenerResult<ListenerResultError>) => void): void;
-/**
- * 对端用户切换了媒体类型
- * @param listener 回调函数
- */
-declare function onRemoteUserMediaTypeChanged(listener: (result: UniListenerResult<ListenerResultData>) => void): void;
-/**
- * 对端用户关闭了摄像头
- * @param listener 回调函数
- */
-declare function onRemoteUserCameraStateChanged(listener: (result: UniListenerResult<ListenerResultData>) => void): void;
-/**
- * 对端用户关闭了麦克风
- * @param listener 回调函数
- */
-declare function onRemoteUserMicrophoneStateChanged(listener: (result: UniListenerResult<ListenerResultData>) => void): void;
-/**
- * 邀请用户
- * @param userIds 被邀请用户id列表
- * @param observerUserIds 被邀请观察者id列表 (只能听或看，不能推流的用户)
- */
-declare function inviteUsers(userIds: string[], observerUserIds: string[]): void;
-/**
- * 移除监听-接收到通话呼入
- */
-declare function removeCallReceivedListener(): void;
-/**
- * 移除监听-通话已接通
- */
-declare function removeCallConnectedListener(): void;
-/**
- * 移除监听-通话已结束
- * @param 挂断原因
- */
-declare function removeCallDisconnectedListener(): void;
-/**
- * 移除监听-对端用户加入了通话
- */
-declare function removeRemoteUserJoinedListener(): void;
-/**
- * 移除监听-对端用户挂断
- */
-declare function removeRemoteUserLeftListener(): void;
-/**
-* 移除监听-有用户被邀请加入通话
-*/
-declare function removeRemoteUserInvited(): void;
-/**
- * 移除监听-开启或关闭摄像头的回调
- */
-declare function removeEnableCameraListener(): void;
-/**
- * 移除监听-切换摄像头回调
- */
-declare function removeSwitchCameraListener(): void;
-/**
- * 移除监听-通话出现错误的回调
- */
-declare function removeErrorListener(): void;
-/**
- * 移除监听-开始呼叫通话的回调
- */
-declare function removeCallOutgoingListener(): void;
-/**
- * 移除监听-对端用户正在振铃
- */
-declare function removeRemoteUserRingingListener(): void;
-/**
- * 移除监听-对端用户切换了媒体类型
- */
-declare function removeRemoteUserMediaTypeChangedListener(): void;
-/**
-* 获取当前calllib本地存储信息
-*
-* 默认不传参数
-*/
-declare function getCurrentCallSession(): any;
-/**
-* 挂断calllib
-*
-* 默认不传参数
-*/
-declare function hangup(): void;
-/**
-* 接收calllib
-*
-* 默认不传参数
-*/
-declare function accept(): void;
-/**
-* 发起单聊呼叫
-*
-* @param targetId 目标ID
-* @param type 呼叫类型（0:音频 1:音视频）
-* @param extra 默认传''
-*
-*/
-declare function startSingleCall(targetId: string, type: number, extra: null): void;
-/**
-* 发起组呼呼叫
-*
-* @param groupId 组ID
-* @param userIds 群组成员
-* @param observerUserIds 观察者ID默认为空数组
-* @param type 呼叫类型（0:音频 1:音视频）
-* @param extra 默认传''
-*
-*/
-declare function startGroupCall(groupId: string, userIds: Array<string>, observerUserIds: Array<string>, type: number, extra: string): void;
-/**
-* 设置预览窗口，此方法需要在视图更新渲染完成后执行
-*
-* @param userId 用户id
-* @param ref ref ID 对应组件的标识
-* @param type 视频显示模式 0 铺满 1 自适应
-* @param isZOrderOnTop android only 是否置顶
-*/
-declare function setVideoView(userId: string, ref: string, type: number, isZOrderOnTop?: boolean): void;
-/**
-* 设置callib是否开启扬声器
-*
-* @param isOpen 默认开启
-*
-*/
-declare function enableSpeaker(isOpen: boolean): void;
-/**
-* 设置callib是否开启麦克风
-*
-* @param isOPen 默认开启
-*
-*/
-declare function enableMicrophone(isOpen: boolean): void;
-/**
-* 切换摄像头
-*
-* 默认不传参数
-*
-*/
-declare function switchCamera(): void;
-/**
-* 获取当前摄像头方式
-*
-* 默认不传参数
-*/
-declare function currentCamera(): any;
-/**
-* 开启摄像头摄像头
-*
-* @param isOpen 是否开启
-* @param RCCallIWCamera 对端还是本端
-*
-*/
-declare function enableCamera(isOpen: boolean, camera: RCCallIWCamera): void;
-/**
- * 修改通话类型
- * @param type
- */
-declare function changeMediaType(type: RCCallIWMediaType): void;
-/**
- * 设置滤镜
- * @param filter
- */
-declare function setBeautyFilter(filter: RCCallIWBeautyFilterType): void;
-/**
- * 获取当前的滤镜
- * 默认不传参数
- */
-declare function getCurrentBeautyFilter(): any;
-/**
- * 设置美颜参数
- * @param enable 默认关闭
- * @param RCCallIWBeautyOption 美颜参数
- */
-declare function setBeautyOption(enable: boolean | undefined, option: RCCallIWBeautyOption): void;
-/**
- * 获取当前的美颜参数
- * 默认不传参数
- */
-declare function getCurrentBeautyOption(): any;
-/**
- * 重置美颜参数和滤镜
- * 默认不传参数
- */
-declare function resetBeauty(): void;
-
-export { RCCallIWBeautyFilterType, RCCallIWCallDisconnectedReason, RCCallIWCamera, RCCallIWMediaType, RCUNICallErrorCode, accept, changeMediaType, currentCamera, enableCamera, enableMicrophone, enableSpeaker, getCurrentBeautyFilter, getCurrentBeautyOption, getCurrentCallSession, hangup, init, inviteUsers, onCallConnected, onCallDisconnected, onCallOutgoing, onCallReceived, onError, onRemoteUserCameraStateChanged, onRemoteUserInvited, onRemoteUserJoined, onRemoteUserLeft, onRemoteUserMediaTypeChanged, onRemoteUserMicrophoneStateChanged, onRemoteUserRinging, removeCallConnectedListener, removeCallDisconnectedListener, removeCallOutgoingListener, removeCallReceivedListener, removeEnableCameraListener, removeErrorListener, removeRemoteUserInvited, removeRemoteUserJoinedListener, removeRemoteUserLeftListener, removeRemoteUserMediaTypeChangedListener, removeRemoteUserRingingListener, removeSwitchCameraListener, resetBeauty, setBeautyFilter, setBeautyOption, setVideoView, startGroupCall, startSingleCall, switchCamera, unInit };
--- a/uni_modules/RongCloud-CallWrapper/lib/index.esm.js
+++ b/uni_modules/RongCloud-CallWrapper/lib/index.esm.js
@@ -1,286 +0,0 @@
-/*
- * RCCallUni - v5.1.14-release.1
- * CommitId - a184e82065a309fc565be987321c44e9da02abbb
- * Thu Jan 06 2022 16:03:36 GMT+0800 (中国标准时间)
- * ©2020 RongCloud, Inc. All rights reserved.
- */
-class Logger {
-  tag;
-
-  constructor(tag) {
-    this.tag = tag;
-  }
-
-  log(str) {
-    console.log(`[${this.tag}] ${new Date().toISOString()} ${str}`);
-  }
-
-}
-const logger = new Logger('RCUNICallLib');
-
-var RCCallIWCamera;
-
-(function (RCCallIWCamera) {
-  RCCallIWCamera[RCCallIWCamera["NONE"] = -1] = "NONE";
-  RCCallIWCamera[RCCallIWCamera["FRONT"] = 0] = "FRONT";
-  RCCallIWCamera[RCCallIWCamera["BACK"] = 1] = "BACK";
-})(RCCallIWCamera || (RCCallIWCamera = {}));
-
-var RCCallIWMediaType;
-
-(function (RCCallIWMediaType) {
-  RCCallIWMediaType[RCCallIWMediaType["AUDIO"] = 0] = "AUDIO";
-  RCCallIWMediaType[RCCallIWMediaType["AUDIO_VIDEO"] = 1] = "AUDIO_VIDEO";
-})(RCCallIWMediaType || (RCCallIWMediaType = {}));
-
-var RCUNICallErrorCode;
-
-(function (RCUNICallErrorCode) {
-  RCUNICallErrorCode[RCUNICallErrorCode["SUCCESS"] = 0] = "SUCCESS";
-  RCUNICallErrorCode[RCUNICallErrorCode["ENGINE_NOT_FOUND"] = 1] = "ENGINE_NOT_FOUND";
-  RCUNICallErrorCode[RCUNICallErrorCode["NETWORK_UNAVAILABLE"] = 2] = "NETWORK_UNAVAILABLE";
-  RCUNICallErrorCode[RCUNICallErrorCode["ONE_CALL_EXISTED"] = 3] = "ONE_CALL_EXISTED";
-  RCUNICallErrorCode[RCUNICallErrorCode["OPERATION_UNAVAILABLE"] = 4] = "OPERATION_UNAVAILABLE";
-  RCUNICallErrorCode[RCUNICallErrorCode["INVALID_PARAM"] = 5] = "INVALID_PARAM";
-  RCUNICallErrorCode[RCUNICallErrorCode["NETWORK_UNSTABLE"] = 6] = "NETWORK_UNSTABLE";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_REQUEST_FAILED"] = 7] = "MEDIA_REQUEST_FAILED";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_NOT_READY"] = 8] = "MEDIA_SERVER_NOT_READY";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_NOT_INITIALIZED"] = 9] = "MEDIA_SERVER_NOT_INITIALIZED";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_REQUEST_TIMEOUT"] = 10] = "MEDIA_REQUEST_TIMEOUT";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_UNKOWN_ERROR"] = 11] = "MEDIA_UNKOWN_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_KICKED_BY_SERVER_ERROR"] = 12] = "MEDIA_KICKED_BY_SERVER_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_CLOSED_ERROR"] = 13] = "MEDIA_SERVER_CLOSED_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_PUBLISH_ERROR"] = 14] = "MEDIA_SERVER_PUBLISH_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_SUBSCRIBE_ERROR"] = 15] = "MEDIA_SERVER_SUBSCRIBE_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_JOIN_ROOM_REFUSE_ERROR"] = 16] = "MEDIA_JOIN_ROOM_REFUSE_ERROR";
-})(RCUNICallErrorCode || (RCUNICallErrorCode = {}));
-
-var RCCallIWCallDisconnectedReason;
-
-(function (RCCallIWCallDisconnectedReason) {
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["CANCEL"] = 0] = "CANCEL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REJECT"] = 1] = "REJECT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["HANGUP"] = 2] = "HANGUP";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["BUSY_LINE"] = 3] = "BUSY_LINE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["NO_RESPONSE"] = 4] = "NO_RESPONSE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["ENGINE_UNSUPPORTED"] = 5] = "ENGINE_UNSUPPORTED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["NETWORK_ERROR"] = 6] = "NETWORK_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["RESOURCE_GET_ERROR"] = 7] = "RESOURCE_GET_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["RESOURCE_PUBLISH_ERROR"] = 8] = "RESOURCE_PUBLISH_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["RESOURCE_SUBSCRIBE_ERROR"] = 9] = "RESOURCE_SUBSCRIBE_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_CANCEL"] = 10] = "REMOTE_CANCEL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_REJECT"] = 11] = "REMOTE_REJECT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_HANGUP"] = 12] = "REMOTE_HANGUP";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_BUSY_LINE"] = 13] = "REMOTE_BUSY_LINE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_NO_RESPONSE"] = 14] = "REMOTE_NO_RESPONSE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_ENGINE_UNSUPPORTED"] = 15] = "REMOTE_ENGINE_UNSUPPORTED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_NETWORK_ERROR"] = 16] = "REMOTE_NETWORK_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_RESOURCE_GET_ERROR"] = 17] = "REMOTE_RESOURCE_GET_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_RESOURCE_PUBLISH_ERROR"] = 18] = "REMOTE_RESOURCE_PUBLISH_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_RESOURCE_SUBSCRIBE_ERROR"] = 19] = "REMOTE_RESOURCE_SUBSCRIBE_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["KICKED_BY_OTHER_CALL"] = 20] = "KICKED_BY_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["IN_OTHER_CALL"] = 21] = "IN_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["KICKED_BY_SERVER"] = 22] = "KICKED_BY_SERVER";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_KICKED_BY_OTHER_CALL"] = 23] = "REMOTE_KICKED_BY_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_IN_OTHER_CALL"] = 24] = "REMOTE_IN_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_KICKED_BY_SERVER"] = 25] = "REMOTE_KICKED_BY_SERVER";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["ACCEPT_BY_OTHER_CLIENT"] = 26] = "ACCEPT_BY_OTHER_CLIENT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["HANGUP_BY_OTHER_CLIENT"] = 27] = "HANGUP_BY_OTHER_CLIENT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REJECTED_BY_BLACKLIST"] = 28] = "REJECTED_BY_BLACKLIST";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["SERVICE_NOT_OPENED"] = 29] = "SERVICE_NOT_OPENED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["DROP_TO_OBSERVER"] = 30] = "DROP_TO_OBSERVER";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["INIT_VIDEO_ERROR"] = 31] = "INIT_VIDEO_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["OTHER_DEVICE_HAD_ACCEPTED"] = 32] = "OTHER_DEVICE_HAD_ACCEPTED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["SERVICE_DISCONNECTED"] = 33] = "SERVICE_DISCONNECTED";
-})(RCCallIWCallDisconnectedReason || (RCCallIWCallDisconnectedReason = {}));
-
-var RCCallIWBeautyFilterType;
-
-(function (RCCallIWBeautyFilterType) {
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["NONE"] = 0] = "NONE";
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["ESTHETIC"] = 1] = "ESTHETIC";
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["FRESH"] = 2] = "FRESH";
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["ROMANTIC"] = 3] = "ROMANTIC";
-})(RCCallIWBeautyFilterType || (RCCallIWBeautyFilterType = {}));
-
-const call = uni.requireNativePlugin('RongCloud-Call-RCUniCall');
-const Platform = uni.getSystemInfoSync().platform;
-logger.log('已进入index.js');
-function init() {
-  logger.log(`init Platform->${Platform}`);
-  call.init({});
-}
-function unInit() {
-  logger.log(`unInit Platform->${Platform}`);
-  call.unInit();
-}
-function onCallReceived(listener) {
-  logger.log(`Engine:OnCallReceived 监听通话呼入 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallReceived", listener);
-}
-function onCallDisconnected(listener) {
-  logger.log(`Engine:OnCallDisconnected 监听通话结束 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallDisconnected", listener);
-}
-function onCallConnected(listener) {
-  logger.log(`Engine:OnCallConnected 已建立通话通话接通 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallConnected", listener);
-}
-function onRemoteUserInvited(listener) {
-  logger.log(`Engine:OnRemoteUserInvited 通话中的某一个参与者，邀请好友加入通话  Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserInvited", listener);
-}
-function onRemoteUserJoined(listener) {
-  logger.log(`Engine:OnRemoteUserJoined 对端用户加入通话 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserJoined", listener);
-}
-function onRemoteUserLeft(listener) {
-  logger.log(`Engine:OnRemoteUserLeft 对端用户挂断(群聊触发) Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserLeft", listener);
-}
-function onCallOutgoing(listener) {
-  logger.log(`Engine:OnCallOutgoing 电话已拨出，通知当前 call 的详细信息 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallOutgoing", listener);
-}
-function onRemoteUserRinging(listener) {
-  logger.log(`Engine:OnRemoteUserRinging 被叫端收到请求，发出振铃响应时监听 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserRinging", listener);
-}
-function onError(listener) {
-  logger.log(`Engine:OnError 通话出现错误 Platform->${Platform}`);
-  call.addEventListener("Engine:OnError", listener);
-}
-function onRemoteUserMediaTypeChanged(listener) {
-  logger.log(`Engine:OnRemoteUserMediaTypeChanged 对端用户切换了媒体类型 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserMediaTypeChanged", listener);
-}
-function onRemoteUserCameraStateChanged(listener) {
-  logger.log(`Engine:OnRemoteUserCameraStateChanged 对端用户关闭了摄像头 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserCameraStateChanged", listener);
-}
-function onRemoteUserMicrophoneStateChanged(listener) {
-  logger.log(`Engine:OnRemoteUserMicrophoneStateChanged 对端用户关闭了麦克风 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserMicrophoneStateChanged", listener);
-}
-function inviteUsers(userIds, observerUserIds) {
-  logger.log(`inviteUsers 邀请用户->${userIds} Platform->${Platform}`);
-  call.inviteUsers(userIds, observerUserIds);
-}
-function removeCallReceivedListener() {
-  logger.log(`removeCallReceivedListener`);
-  call.removeAllEventListeners('Engine:OnCallReceived');
-}
-function removeCallConnectedListener() {
-  logger.log(`removeCallConnectedListener`);
-  call.removeAllEventListeners('Engine:OnCallConnected');
-}
-function removeCallDisconnectedListener() {
-  logger.log(`removeCallDisconnectedListener`);
-  call.removeAllEventListeners('Engine:OnCallDisconnected');
-}
-function removeRemoteUserJoinedListener() {
-  logger.log(`removeRemoteUserJoinedListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserJoined');
-}
-function removeRemoteUserLeftListener() {
-  logger.log(`removeRemoteUserLeftListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserLeft');
-}
-function removeRemoteUserInvited() {
-  logger.log(`removeRemoteUserInvited`);
-  call.removeAllEventListeners('Engine:OnRemoteUserInvited');
-}
-function removeEnableCameraListener() {
-  logger.log(`removeEnableCameraListener`);
-  call.removeAllEventListeners('Engine:OnEnableCamera');
-}
-function removeSwitchCameraListener() {
-  logger.log(`removeSwitchCameraListener`);
-  call.removeAllEventListeners('Engine:OnSwitchCamera');
-}
-function removeErrorListener() {
-  logger.log(`removeErrorListener`);
-  call.removeAllEventListeners('Engine:OnError');
-}
-function removeCallOutgoingListener() {
-  logger.log(`removeCallOutgoingListener`);
-  call.removeAllEventListeners('Engine:OnCallOutgoing');
-}
-function removeRemoteUserRingingListener() {
-  logger.log(`removeRemoteUserRingingListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserRinging');
-}
-function removeRemoteUserMediaTypeChangedListener() {
-  logger.log(`removeRemoteUserMediaTypeChangedListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserMediaTypeChanged');
-}
-function getCurrentCallSession() {
-  logger.log(`getCurrentCallSession Platform->${Platform}`);
-  return call.getCurrentCallSession();
-}
-function hangup() {
-  logger.log(`hangup Platform->${Platform}`);
-  call.hangup();
-}
-function accept() {
-  logger.log(`accept Platform->${Platform}`);
-  call.accept();
-}
-function startSingleCall(targetId, type, extra) {
-  logger.log(`startSingleCall targetId->${targetId} type=>${type} extra=>${extra} Platform->${Platform}`);
-  call.startSingleCall(targetId, type, extra);
-}
-function startGroupCall(groupId, userIds, observerUserIds, type, extra) {
-  logger.log(`startGroupCall groupId->${groupId} userIds=>${userIds} observerUserIds=>${observerUserIds} type=>${type} extra=>${extra} Platform->${Platform}`);
-  call.startGroupCall(groupId, userIds, observerUserIds, type, extra);
-}
-function setVideoView(userId, ref, type, isZOrderOnTop = false) {
-  logger.log(`setVideoView userId->${userId} ref=>${ref} type=>${type} isZOrderOnTop=>${isZOrderOnTop} Platform->${Platform}`);
-  Platform === 'android' ? call.setVideoView(userId, ref, type, isZOrderOnTop) : call.setVideoView(userId, ref, type);
-}
-function enableSpeaker(isOpen) {
-  logger.log(`enableSpeaker isOPen->${isOpen} Platform->${Platform}`);
-  call.enableSpeaker(isOpen);
-}
-function enableMicrophone(isOpen) {
-  logger.log(`enableMicrophone isOPen->${isOpen} Platform->${Platform}`);
-  call.enableMicrophone(isOpen);
-}
-function switchCamera() {
-  logger.log(`switchCamera Platform->${Platform}`);
-  call.switchCamera();
-}
-function currentCamera() {
-  logger.log(`currentCamera Platform->${Platform}`);
-  return call.currentCamera();
-}
-function enableCamera(isOpen, camera) {
-  logger.log(`enableCamera isOpen=>${isOpen} camera=>${camera} Platform->${Platform}`);
-  call.enableCamera(isOpen, camera);
-}
-function changeMediaType(type) {
-  logger.log(`changeMediaType type=>${type}  Platform->${Platform}`);
-  call.changeMediaType(type);
-}
-function setBeautyFilter(filter) {
-  logger.log(`setBeautyFilter filter=>${filter}  Platform->${Platform}`);
-  call.setBeautyFilter(filter);
-}
-function getCurrentBeautyFilter() {
-  logger.log(`getCurrentBeautyFilter Platform->${Platform}`);
-  return call.getCurrentBeautyFilter();
-}
-function setBeautyOption(enable = false, option) {
-  logger.log(`setBeautyOption enable=>${enable} option=>${option} Platform->${Platform}`);
-  call.setBeautyOption(enable, option);
-}
-function getCurrentBeautyOption() {
-  logger.log(`getCurrentBeautyOption Platform->${Platform}`);
-  return call.getCurrentBeautyOption();
-}
-function resetBeauty() {
-  logger.log(`resetBeauty Platform->${Platform}`);
-  call.resetBeauty();
-}
-
-export { RCCallIWBeautyFilterType, RCCallIWCallDisconnectedReason, RCCallIWCamera, RCCallIWMediaType, RCUNICallErrorCode, accept, changeMediaType, currentCamera, enableCamera, enableMicrophone, enableSpeaker, getCurrentBeautyFilter, getCurrentBeautyOption, getCurrentCallSession, hangup, init, inviteUsers, onCallConnected, onCallDisconnected, onCallOutgoing, onCallReceived, onError, onRemoteUserCameraStateChanged, onRemoteUserInvited, onRemoteUserJoined, onRemoteUserLeft, onRemoteUserMediaTypeChanged, onRemoteUserMicrophoneStateChanged, onRemoteUserRinging, removeCallConnectedListener, removeCallDisconnectedListener, removeCallOutgoingListener, removeCallReceivedListener, removeEnableCameraListener, removeErrorListener, removeRemoteUserInvited, removeRemoteUserJoinedListener, removeRemoteUserLeftListener, removeRemoteUserMediaTypeChangedListener, removeRemoteUserRingingListener, removeSwitchCameraListener, resetBeauty, setBeautyFilter, setBeautyOption, setVideoView, startGroupCall, startSingleCall, switchCamera, unInit };
--- a/uni_modules/RongCloud-CallWrapper/lib/index.js
+++ b/uni_modules/RongCloud-CallWrapper/lib/index.js
@@ -1,333 +0,0 @@
-/*
- * RCCallUni - v5.1.14-release.1
- * CommitId - a184e82065a309fc565be987321c44e9da02abbb
- * Thu Jan 06 2022 16:03:36 GMT+0800 (中国标准时间)
- * ©2020 RongCloud, Inc. All rights reserved.
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-class Logger {
-  tag;
-
-  constructor(tag) {
-    this.tag = tag;
-  }
-
-  log(str) {
-    console.log(`[${this.tag}] ${new Date().toISOString()} ${str}`);
-  }
-
-}
-const logger = new Logger('RCUNICallLib');
-
-exports.RCCallIWCamera = void 0;
-
-(function (RCCallIWCamera) {
-  RCCallIWCamera[RCCallIWCamera["NONE"] = -1] = "NONE";
-  RCCallIWCamera[RCCallIWCamera["FRONT"] = 0] = "FRONT";
-  RCCallIWCamera[RCCallIWCamera["BACK"] = 1] = "BACK";
-})(exports.RCCallIWCamera || (exports.RCCallIWCamera = {}));
-
-exports.RCCallIWMediaType = void 0;
-
-(function (RCCallIWMediaType) {
-  RCCallIWMediaType[RCCallIWMediaType["AUDIO"] = 0] = "AUDIO";
-  RCCallIWMediaType[RCCallIWMediaType["AUDIO_VIDEO"] = 1] = "AUDIO_VIDEO";
-})(exports.RCCallIWMediaType || (exports.RCCallIWMediaType = {}));
-
-exports.RCUNICallErrorCode = void 0;
-
-(function (RCUNICallErrorCode) {
-  RCUNICallErrorCode[RCUNICallErrorCode["SUCCESS"] = 0] = "SUCCESS";
-  RCUNICallErrorCode[RCUNICallErrorCode["ENGINE_NOT_FOUND"] = 1] = "ENGINE_NOT_FOUND";
-  RCUNICallErrorCode[RCUNICallErrorCode["NETWORK_UNAVAILABLE"] = 2] = "NETWORK_UNAVAILABLE";
-  RCUNICallErrorCode[RCUNICallErrorCode["ONE_CALL_EXISTED"] = 3] = "ONE_CALL_EXISTED";
-  RCUNICallErrorCode[RCUNICallErrorCode["OPERATION_UNAVAILABLE"] = 4] = "OPERATION_UNAVAILABLE";
-  RCUNICallErrorCode[RCUNICallErrorCode["INVALID_PARAM"] = 5] = "INVALID_PARAM";
-  RCUNICallErrorCode[RCUNICallErrorCode["NETWORK_UNSTABLE"] = 6] = "NETWORK_UNSTABLE";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_REQUEST_FAILED"] = 7] = "MEDIA_REQUEST_FAILED";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_NOT_READY"] = 8] = "MEDIA_SERVER_NOT_READY";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_NOT_INITIALIZED"] = 9] = "MEDIA_SERVER_NOT_INITIALIZED";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_REQUEST_TIMEOUT"] = 10] = "MEDIA_REQUEST_TIMEOUT";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_UNKOWN_ERROR"] = 11] = "MEDIA_UNKOWN_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_KICKED_BY_SERVER_ERROR"] = 12] = "MEDIA_KICKED_BY_SERVER_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_CLOSED_ERROR"] = 13] = "MEDIA_SERVER_CLOSED_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_PUBLISH_ERROR"] = 14] = "MEDIA_SERVER_PUBLISH_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_SERVER_SUBSCRIBE_ERROR"] = 15] = "MEDIA_SERVER_SUBSCRIBE_ERROR";
-  RCUNICallErrorCode[RCUNICallErrorCode["MEDIA_JOIN_ROOM_REFUSE_ERROR"] = 16] = "MEDIA_JOIN_ROOM_REFUSE_ERROR";
-})(exports.RCUNICallErrorCode || (exports.RCUNICallErrorCode = {}));
-
-exports.RCCallIWCallDisconnectedReason = void 0;
-
-(function (RCCallIWCallDisconnectedReason) {
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["CANCEL"] = 0] = "CANCEL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REJECT"] = 1] = "REJECT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["HANGUP"] = 2] = "HANGUP";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["BUSY_LINE"] = 3] = "BUSY_LINE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["NO_RESPONSE"] = 4] = "NO_RESPONSE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["ENGINE_UNSUPPORTED"] = 5] = "ENGINE_UNSUPPORTED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["NETWORK_ERROR"] = 6] = "NETWORK_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["RESOURCE_GET_ERROR"] = 7] = "RESOURCE_GET_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["RESOURCE_PUBLISH_ERROR"] = 8] = "RESOURCE_PUBLISH_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["RESOURCE_SUBSCRIBE_ERROR"] = 9] = "RESOURCE_SUBSCRIBE_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_CANCEL"] = 10] = "REMOTE_CANCEL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_REJECT"] = 11] = "REMOTE_REJECT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_HANGUP"] = 12] = "REMOTE_HANGUP";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_BUSY_LINE"] = 13] = "REMOTE_BUSY_LINE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_NO_RESPONSE"] = 14] = "REMOTE_NO_RESPONSE";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_ENGINE_UNSUPPORTED"] = 15] = "REMOTE_ENGINE_UNSUPPORTED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_NETWORK_ERROR"] = 16] = "REMOTE_NETWORK_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_RESOURCE_GET_ERROR"] = 17] = "REMOTE_RESOURCE_GET_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_RESOURCE_PUBLISH_ERROR"] = 18] = "REMOTE_RESOURCE_PUBLISH_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_RESOURCE_SUBSCRIBE_ERROR"] = 19] = "REMOTE_RESOURCE_SUBSCRIBE_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["KICKED_BY_OTHER_CALL"] = 20] = "KICKED_BY_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["IN_OTHER_CALL"] = 21] = "IN_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["KICKED_BY_SERVER"] = 22] = "KICKED_BY_SERVER";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_KICKED_BY_OTHER_CALL"] = 23] = "REMOTE_KICKED_BY_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_IN_OTHER_CALL"] = 24] = "REMOTE_IN_OTHER_CALL";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REMOTE_KICKED_BY_SERVER"] = 25] = "REMOTE_KICKED_BY_SERVER";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["ACCEPT_BY_OTHER_CLIENT"] = 26] = "ACCEPT_BY_OTHER_CLIENT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["HANGUP_BY_OTHER_CLIENT"] = 27] = "HANGUP_BY_OTHER_CLIENT";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["REJECTED_BY_BLACKLIST"] = 28] = "REJECTED_BY_BLACKLIST";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["SERVICE_NOT_OPENED"] = 29] = "SERVICE_NOT_OPENED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["DROP_TO_OBSERVER"] = 30] = "DROP_TO_OBSERVER";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["INIT_VIDEO_ERROR"] = 31] = "INIT_VIDEO_ERROR";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["OTHER_DEVICE_HAD_ACCEPTED"] = 32] = "OTHER_DEVICE_HAD_ACCEPTED";
-  RCCallIWCallDisconnectedReason[RCCallIWCallDisconnectedReason["SERVICE_DISCONNECTED"] = 33] = "SERVICE_DISCONNECTED";
-})(exports.RCCallIWCallDisconnectedReason || (exports.RCCallIWCallDisconnectedReason = {}));
-
-exports.RCCallIWBeautyFilterType = void 0;
-
-(function (RCCallIWBeautyFilterType) {
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["NONE"] = 0] = "NONE";
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["ESTHETIC"] = 1] = "ESTHETIC";
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["FRESH"] = 2] = "FRESH";
-  RCCallIWBeautyFilterType[RCCallIWBeautyFilterType["ROMANTIC"] = 3] = "ROMANTIC";
-})(exports.RCCallIWBeautyFilterType || (exports.RCCallIWBeautyFilterType = {}));
-
-const call = uni.requireNativePlugin('RongCloud-Call-RCUniCall');
-const Platform = uni.getSystemInfoSync().platform;
-logger.log('已进入index.js');
-function init() {
-  logger.log(`init Platform->${Platform}`);
-  call.init({});
-}
-function unInit() {
-  logger.log(`unInit Platform->${Platform}`);
-  call.unInit();
-}
-function onCallReceived(listener) {
-  logger.log(`Engine:OnCallReceived 监听通话呼入 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallReceived", listener);
-}
-function onCallDisconnected(listener) {
-  logger.log(`Engine:OnCallDisconnected 监听通话结束 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallDisconnected", listener);
-}
-function onCallConnected(listener) {
-  logger.log(`Engine:OnCallConnected 已建立通话通话接通 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallConnected", listener);
-}
-function onRemoteUserInvited(listener) {
-  logger.log(`Engine:OnRemoteUserInvited 通话中的某一个参与者，邀请好友加入通话  Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserInvited", listener);
-}
-function onRemoteUserJoined(listener) {
-  logger.log(`Engine:OnRemoteUserJoined 对端用户加入通话 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserJoined", listener);
-}
-function onRemoteUserLeft(listener) {
-  logger.log(`Engine:OnRemoteUserLeft 对端用户挂断(群聊触发) Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserLeft", listener);
-}
-function onCallOutgoing(listener) {
-  logger.log(`Engine:OnCallOutgoing 电话已拨出，通知当前 call 的详细信息 Platform->${Platform}`);
-  call.addEventListener("Engine:OnCallOutgoing", listener);
-}
-function onRemoteUserRinging(listener) {
-  logger.log(`Engine:OnRemoteUserRinging 被叫端收到请求，发出振铃响应时监听 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserRinging", listener);
-}
-function onError(listener) {
-  logger.log(`Engine:OnError 通话出现错误 Platform->${Platform}`);
-  call.addEventListener("Engine:OnError", listener);
-}
-function onRemoteUserMediaTypeChanged(listener) {
-  logger.log(`Engine:OnRemoteUserMediaTypeChanged 对端用户切换了媒体类型 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserMediaTypeChanged", listener);
-}
-function onRemoteUserCameraStateChanged(listener) {
-  logger.log(`Engine:OnRemoteUserCameraStateChanged 对端用户关闭了摄像头 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserCameraStateChanged", listener);
-}
-function onRemoteUserMicrophoneStateChanged(listener) {
-  logger.log(`Engine:OnRemoteUserMicrophoneStateChanged 对端用户关闭了麦克风 Platform->${Platform}`);
-  call.addEventListener("Engine:OnRemoteUserMicrophoneStateChanged", listener);
-}
-function inviteUsers(userIds, observerUserIds) {
-  logger.log(`inviteUsers 邀请用户->${userIds} Platform->${Platform}`);
-  call.inviteUsers(userIds, observerUserIds);
-}
-function removeCallReceivedListener() {
-  logger.log(`removeCallReceivedListener`);
-  call.removeAllEventListeners('Engine:OnCallReceived');
-}
-function removeCallConnectedListener() {
-  logger.log(`removeCallConnectedListener`);
-  call.removeAllEventListeners('Engine:OnCallConnected');
-}
-function removeCallDisconnectedListener() {
-  logger.log(`removeCallDisconnectedListener`);
-  call.removeAllEventListeners('Engine:OnCallDisconnected');
-}
-function removeRemoteUserJoinedListener() {
-  logger.log(`removeRemoteUserJoinedListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserJoined');
-}
-function removeRemoteUserLeftListener() {
-  logger.log(`removeRemoteUserLeftListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserLeft');
-}
-function removeRemoteUserInvited() {
-  logger.log(`removeRemoteUserInvited`);
-  call.removeAllEventListeners('Engine:OnRemoteUserInvited');
-}
-function removeEnableCameraListener() {
-  logger.log(`removeEnableCameraListener`);
-  call.removeAllEventListeners('Engine:OnEnableCamera');
-}
-function removeSwitchCameraListener() {
-  logger.log(`removeSwitchCameraListener`);
-  call.removeAllEventListeners('Engine:OnSwitchCamera');
-}
-function removeErrorListener() {
-  logger.log(`removeErrorListener`);
-  call.removeAllEventListeners('Engine:OnError');
-}
-function removeCallOutgoingListener() {
-  logger.log(`removeCallOutgoingListener`);
-  call.removeAllEventListeners('Engine:OnCallOutgoing');
-}
-function removeRemoteUserRingingListener() {
-  logger.log(`removeRemoteUserRingingListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserRinging');
-}
-function removeRemoteUserMediaTypeChangedListener() {
-  logger.log(`removeRemoteUserMediaTypeChangedListener`);
-  call.removeAllEventListeners('Engine:OnRemoteUserMediaTypeChanged');
-}
-function getCurrentCallSession() {
-  logger.log(`getCurrentCallSession Platform->${Platform}`);
-  return call.getCurrentCallSession();
-}
-function hangup() {
-  logger.log(`hangup Platform->${Platform}`);
-  call.hangup();
-}
-function accept() {
-  logger.log(`accept Platform->${Platform}`);
-  call.accept();
-}
-function startSingleCall(targetId, type, extra) {
-  logger.log(`startSingleCall targetId->${targetId} type=>${type} extra=>${extra} Platform->${Platform}`);
-  call.startSingleCall(targetId, type, extra);
-}
-function startGroupCall(groupId, userIds, observerUserIds, type, extra) {
-  logger.log(`startGroupCall groupId->${groupId} userIds=>${userIds} observerUserIds=>${observerUserIds} type=>${type} extra=>${extra} Platform->${Platform}`);
-  call.startGroupCall(groupId, userIds, observerUserIds, type, extra);
-}
-function setVideoView(userId, ref, type, isZOrderOnTop = false) {
-  logger.log(`setVideoView userId->${userId} ref=>${ref} type=>${type} isZOrderOnTop=>${isZOrderOnTop} Platform->${Platform}`);
-  Platform === 'android' ? call.setVideoView(userId, ref, type, isZOrderOnTop) : call.setVideoView(userId, ref, type);
-}
-function enableSpeaker(isOpen) {
-  logger.log(`enableSpeaker isOPen->${isOpen} Platform->${Platform}`);
-  call.enableSpeaker(isOpen);
-}
-function enableMicrophone(isOpen) {
-  logger.log(`enableMicrophone isOPen->${isOpen} Platform->${Platform}`);
-  call.enableMicrophone(isOpen);
-}
-function switchCamera() {
-  logger.log(`switchCamera Platform->${Platform}`);
-  call.switchCamera();
-}
-function currentCamera() {
-  logger.log(`currentCamera Platform->${Platform}`);
-  return call.currentCamera();
-}
-function enableCamera(isOpen, camera) {
-  logger.log(`enableCamera isOpen=>${isOpen} camera=>${camera} Platform->${Platform}`);
-  call.enableCamera(isOpen, camera);
-}
-function changeMediaType(type) {
-  logger.log(`changeMediaType type=>${type}  Platform->${Platform}`);
-  call.changeMediaType(type);
-}
-function setBeautyFilter(filter) {
-  logger.log(`setBeautyFilter filter=>${filter}  Platform->${Platform}`);
-  call.setBeautyFilter(filter);
-}
-function getCurrentBeautyFilter() {
-  logger.log(`getCurrentBeautyFilter Platform->${Platform}`);
-  return call.getCurrentBeautyFilter();
-}
-function setBeautyOption(enable = false, option) {
-  logger.log(`setBeautyOption enable=>${enable} option=>${option} Platform->${Platform}`);
-  call.setBeautyOption(enable, option);
-}
-function getCurrentBeautyOption() {
-  logger.log(`getCurrentBeautyOption Platform->${Platform}`);
-  return call.getCurrentBeautyOption();
-}
-function resetBeauty() {
-  logger.log(`resetBeauty Platform->${Platform}`);
-  call.resetBeauty();
-}
-
-exports.accept = accept;
-exports.changeMediaType = changeMediaType;
-exports.currentCamera = currentCamera;
-exports.enableCamera = enableCamera;
-exports.enableMicrophone = enableMicrophone;
-exports.enableSpeaker = enableSpeaker;
-exports.getCurrentBeautyFilter = getCurrentBeautyFilter;
-exports.getCurrentBeautyOption = getCurrentBeautyOption;
-exports.getCurrentCallSession = getCurrentCallSession;
-exports.hangup = hangup;
-exports.init = init;
-exports.inviteUsers = inviteUsers;
-exports.onCallConnected = onCallConnected;
-exports.onCallDisconnected = onCallDisconnected;
-exports.onCallOutgoing = onCallOutgoing;
-exports.onCallReceived = onCallReceived;
-exports.onError = onError;
-exports.onRemoteUserCameraStateChanged = onRemoteUserCameraStateChanged;
-exports.onRemoteUserInvited = onRemoteUserInvited;
-exports.onRemoteUserJoined = onRemoteUserJoined;
-exports.onRemoteUserLeft = onRemoteUserLeft;
-exports.onRemoteUserMediaTypeChanged = onRemoteUserMediaTypeChanged;
-exports.onRemoteUserMicrophoneStateChanged = onRemoteUserMicrophoneStateChanged;
-exports.onRemoteUserRinging = onRemoteUserRinging;
-exports.removeCallConnectedListener = removeCallConnectedListener;
-exports.removeCallDisconnectedListener = removeCallDisconnectedListener;
-exports.removeCallOutgoingListener = removeCallOutgoingListener;
-exports.removeCallReceivedListener = removeCallReceivedListener;
-exports.removeEnableCameraListener = removeEnableCameraListener;
-exports.removeErrorListener = removeErrorListener;
-exports.removeRemoteUserInvited = removeRemoteUserInvited;
-exports.removeRemoteUserJoinedListener = removeRemoteUserJoinedListener;
-exports.removeRemoteUserLeftListener = removeRemoteUserLeftListener;
-exports.removeRemoteUserMediaTypeChangedListener = removeRemoteUserMediaTypeChangedListener;
-exports.removeRemoteUserRingingListener = removeRemoteUserRingingListener;
-exports.removeSwitchCameraListener = removeSwitchCameraListener;
-exports.resetBeauty = resetBeauty;
-exports.setBeautyFilter = setBeautyFilter;
-exports.setBeautyOption = setBeautyOption;
-exports.setVideoView = setVideoView;
-exports.startGroupCall = startGroupCall;
-exports.startSingleCall = startSingleCall;
-exports.switchCamera = switchCamera;
-exports.unInit = unInit;
--- a/uni_modules/RongCloud-CallWrapper/package.json
+++ b/uni_modules/RongCloud-CallWrapper/package.json
@@ -1,80 +0,0 @@
-{
-  "id": "RongCloud-CallWrapper",
-  "displayName": "RongCloud-CallWrapper",
-  "version": "5.1.15",
-  "description": "RongCloud-CallWrapper",
-  "keywords": [
-    "RongCloud-CallWrapper"
-],
-  "repository": "",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "dcloudext": {
-    "category": [
-        "JS SDK",
-        "通用 SDK"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "插件不采集任何数据",
-      "permissions": "无"
-    },
-    "npmurl": ""
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "Vue": {
-          "vue2": "y",
-          "vue3": "y"
-        },
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "n",
-          "Android Browser": "n",
-          "微信浏览器(Android)": "n",
-          "QQ浏览器(Android)": "n"
-        },
-        "H5-pc": {
-          "Chrome": "n",
-          "IE": "n",
-          "Edge": "n",
-          "Firefox": "n",
-          "Safari": "n"
-        },
-        "小程序": {
-          "微信": "n",
-          "阿里": "n",
-          "百度": "n",
-          "字节跳动": "n",
-          "QQ": "n"
-        },
-        "快应用": {
-          "华为": "n",
-          "联盟": "n"
-        }
-      }
-    }
-  }
-}
--- a/uni_modules/RongCloud-CallWrapper/readme.md
+++ b/uni_modules/RongCloud-CallWrapper/readme.md
@@ -1 +0,0 @@
-# RongCloud-CallWrapper
--- a/uni_modules/RongCloud-IMWrapper/changelog.md
+++ b/uni_modules/RongCloud-IMWrapper/changelog.md
@@ -1,4 +0,0 @@
-## 5.1.3-7（2022-01-19）
-调整私聊已读回执回调参数
-## 0.0.1（2022-01-19）
-从npm迁入插件市场
--- a/uni_modules/RongCloud-IMWrapper/js_sdk/index.d.ts
+++ b/uni_modules/RongCloud-IMWrapper/js_sdk/index.d.ts
--- a/uni_modules/RongCloud-IMWrapper/js_sdk/index.esm.js
+++ b/uni_modules/RongCloud-IMWrapper/js_sdk/index.esm.js
--- a/uni_modules/RongCloud-IMWrapper/js_sdk/index.js
+++ b/uni_modules/RongCloud-IMWrapper/js_sdk/index.js
--- a/uni_modules/RongCloud-IMWrapper/package.json
+++ b/uni_modules/RongCloud-IMWrapper/package.json
@@ -1,80 +0,0 @@
-{
-  "id": "RongCloud-IMWrapper",
-  "displayName": "RongCloud-IMWrapper",
-  "version": "5.1.3-7",
-  "description": "融云IM原生插件包装层",
-  "keywords": [
-    "RongCloud-IMWrapper"
-],
-  "repository": "",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "dcloudext": {
-    "category": [
-        "JS SDK",
-        "通用 SDK"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "插件不采集任何数据",
-      "permissions": "无"
-    },
-    "npmurl": ""
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "Vue": {
-          "vue2": "n",
-          "vue3": "n"
-        },
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "n",
-          "Android Browser": "n",
-          "微信浏览器(Android)": "n",
-          "QQ浏览器(Android)": "n"
-        },
-        "H5-pc": {
-          "Chrome": "n",
-          "IE": "n",
-          "Edge": "n",
-          "Firefox": "n",
-          "Safari": "n"
-        },
-        "小程序": {
-          "微信": "n",
-          "阿里": "n",
-          "百度": "n",
-          "字节跳动": "n",
-          "QQ": "n"
-        },
-        "快应用": {
-          "华为": "n",
-          "联盟": "n"
-        }
-      }
-    }
-  }
-}
--- a/uni_modules/RongCloud-IMWrapper/readme.md
+++ b/uni_modules/RongCloud-IMWrapper/readme.md
@@ -1 +0,0 @@
-# RongCloud-IMWrapper
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,60 @@
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
--- a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholderText" :focus="focus" >
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t } = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits:['confirm','close'],
+		props: {
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				this.val = val
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		mounted() {
+			this.focus = true
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input'){
+					this.$emit('confirm', this.val)
+				}else{
+					this.$emit('confirm')
+				}
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			close(){
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
--- a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,191 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信好友',
+						icon: require('@/static/icon/share_icon_01.png'),
+						name: 'wxchum'
+					},
+					{
+						text: '朋友圈',
+						icon: require('@/static/icon/share_icon_00.png'),
+						name: 'wxcircle'
+					},
+					{
+						text: 'QQ',
+						icon: require('@/static/icon/share_icon_02.png'),
+						name: 'qq'
+					},
+					// {
+					// 	text: '新浪',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+					// 	name: 'sina'
+					// },
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 33.33%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 45rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+		color: white;
+		font-size: 16px;
+		background: #34CE98;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+		display: none;
+	}
+</style>
--- a/uni_modules/uni-popup/components/uni-popup/i18n/en.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
--- a/uni_modules/uni-popup/components/uni-popup/i18n/index.js
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
--- a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
--- a/uni_modules/uni-popup/components/uni-popup/keypress.js
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
--- a/uni_modules/uni-popup/components/uni-popup/popup.js
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,474 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+			}
+		},
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					clearTimeout(this.timer)
+					this.showPopup = false
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				this.ani = ['zoom-out', 'fade']
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,90 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.7.9",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+	"dcloudext": {
+		"category": [
+			"前端组件",
+			"通用组件"
+		],
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
--- a/uni_modules/uni-popup/readme.md
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,20 @@
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
--- a/uni_modules/uni-transition/components/uni-transition/createAnimation.js
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,128 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		this.animation = uni.createAnimation(options)
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
--- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,277 @@
+<template>
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 1 : 0,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
--- a/uni_modules/uni-transition/package.json
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.1",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-transition/readme.md
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839