tuikit-atomicx-vue3 3.3.4 → 3.4.1

package/src/components/MessageList/i18n/en-US.ts

@@ -52,4 +52,27 @@ const MessageList = {
   delete_failed: 'Delete Failed',
 };
 
-export default MessageList;
+const CallMessage = {
+  start_call: '{{messageSender}} start call',
+  call_ended: 'Call ended',
+  call_duration: 'Call duration',
+  switch_to_audio_call: 'Switch to audio call',
+  switch_to_video_call: 'Switch to video call',
+  cancel_call: 'Cancel call',
+  canceled: 'Canceled',
+  canceled_by_recipient: 'Call canceled by caller',
+  answered: 'Answered',
+  decline_call: 'Decline call',
+  declined: 'Declined',
+  line_busy: 'Line busy',
+  missed_due_to_busy: 'Missed due to busy line',
+  declined_by_recipient: 'Call declined by user',
+  no_answer: 'No answer',
+  no_answer_from_recipient: 'Call wasn\'t answered',
+  no_answer_timeout: 'Call not answered (timeout)',
+};
+
+export {
+  MessageList,
+  CallMessage,
+};

package/src/components/MessageList/i18n/index.ts

@@ -1,9 +1,9 @@
-import enUS from './en-US';
-import zhCN from './zh-CN';
+import { MessageList as MessageListEn, CallMessage as CallMessageEn } from './en-US';
+import { MessageList as MessageListZh, CallMessage as CallMessageZh } from './zh-CN';
 
 const resources = {
-  'en-US': enUS,
-  'zh-CN': zhCN,
+  'en-US': { MessageList: MessageListEn, CallMessage: CallMessageEn },
+  'zh-CN': { MessageList: MessageListZh, CallMessage: CallMessageZh },
 };
 
 export { resources };

package/src/components/MessageList/i18n/zh-CN.ts

@@ -51,4 +51,27 @@ const MessageList = {
   delete_failed: '删除失败',
 };
 
-export default MessageList;
+const CallMessage = {
+  start_call: '{{messageSender}} 发起通话',
+  call_ended: '通话结束',
+  call_duration: '通话时长',
+  switch_to_audio_call: '切换语音通话',
+  switch_to_video_call: '切换视频通话',
+  cancel_call: '取消通话',
+  canceled: '已取消',
+  canceled_by_recipient: '对方已取消',
+  answered: '已接听',
+  decline_call: '拒绝通话',
+  declined: '已拒绝',
+  line_busy: '对方忙线中',
+  missed_due_to_busy: '忙线未接听',
+  declined_by_recipient: '对方已拒绝',
+  no_answer: '无应答',
+  no_answer_from_recipient: '对方无应答',
+  no_answer_timeout: '超时无应答',
+};
+
+export {
+  MessageList,
+  CallMessage,
+}

package/src/components/MessageList/index.ts

@@ -3,8 +3,8 @@ import MessageListComponent from './MessageList.vue';
 import { addI18n } from '../../i18n';
 import { resources } from './i18n';
 
-addI18n('en-US', { translation: { MessageList: resources['en-US'] } });
-addI18n('zh-CN', { translation: { MessageList: resources['zh-CN'] } });
+addI18n('en-US', { translation: { ...resources['en-US'] } });
+addI18n('zh-CN', { translation: { ...resources['zh-CN'] } });
 
 const Message = MessageComponent;
 const MessageList = MessageListComponent;

package/src/components/UserPicker/UserPicker.vue

@@ -206,8 +206,6 @@ defineExpose(refMethods);
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  width: 100%;
-  height: 100%;
 
   &__panel {
     flex: 1;

package/src/hooks/index.ts

@@ -1,4 +1,3 @@
 export { useLongPress } from './useLongPress';
+export { useMouseHover } from './useMouseHover';
 export type { UseLongPressOptions } from './useLongPress';
-
-export { useMouseHover } from './useMouseHover';

package/src/hooks/useMessageActions.ts

@@ -1,6 +1,5 @@
 import type { Component } from 'vue';
 import { computed } from 'vue';
-import ChatEngine from '@tencentcloud/chat-uikit-engine';
 import {
   IconCopy,
   IconMsgRevoke,
@@ -12,7 +11,8 @@ import {
 } from '@tencentcloud/uikit-base-component-vue3';
 import { useMessageActionState } from '../states/MessageActionState';
 import { isCallMessage } from '../utils/call';
-import type { IMessageModel as MessageModel } from '@tencentcloud/chat-uikit-engine';
+import { MessageType } from '../types/engine';
+import type { MessageModel } from '../types/engine';
 
 /**
  * Message action interface
@@ -43,7 +43,7 @@ const DEFAULT_ACTIONS: Record<string, MessageAction> = {
   copy: {
     key: 'copy',
     label: 'copy',
-    visible: (message: MessageModel) => message.type === ChatEngine.TYPES.MSG_TEXT,
+    visible: (message: MessageModel) => message.type === MessageType.TEXT,
     icon: IconCopy,
   },
   recall: {

package/src/index.ts

@@ -2,9 +2,10 @@ import { useLoginState } from './states/LoginState';
 
 export * from './chat';
 export * from './rtc';
-export * from './components/Avatar';
 export * from './i18n';
 export * from './types';
+export * from './components/Avatar';
+export * from './components/UserPicker';
 
 export {
   useLoginState,

package/src/rtc/index.ts

@@ -5,6 +5,7 @@ import { BarrageInput as BarrageInputComponent } from '../components/BarrageInpu
 import { BarrageList as BarrageListComponent } from '../components/BarrageList';
 import { CameraButton as CameraButtonComponent } from '../components/CameraButton';
 import { CoGuestPanel as CoGuestPanelComponent } from '../components/CoGuestPanel';
+import { CoHostPanel as CoHostPanelComponent } from '../components/CoHostPanel';
 import { LiveAudienceList as LiveAudienceListComponent } from '../components/LiveAudienceList';
 import { LiveCoreView as LiveCoreViewComponent } from '../components/LiveCoreView';
 import { LiveList as LiveListComponent } from '../components/LiveList';
@@ -26,6 +27,7 @@ import { useLiveState as LiveState } from '../states/LiveState';
 import { useRoomState as RoomState } from '../states/RoomState';
 import { useUserState as UserState } from '../states/UserState';
 import { useVideoMixerState as VideoMixerState } from '../states/VideoMixerState';
+import { useBattleState  } from '../states/BattleState';
 import { useRoomEngine as RoomEngine } from '../hooks/useRoomEngine';
 
 import RTCLoginServer from './server';
@@ -39,6 +41,7 @@ const StreamMixer = StreamMixerComponent;
 const LiveScenePanel = LiveScenePanelComponent;
 const LiveAudienceList = LiveAudienceListComponent;
 const CoGuestPanel = CoGuestPanelComponent;
+const CoHostPanel = CoHostPanelComponent;
 const AudioSettingPanel = AudioSettingPanelComponent;
 const VideoSettingPanel = VideoSettingPanelComponent;
 const MicButton = MicButtonComponent;
@@ -71,6 +74,7 @@ export {
   LiveScenePanel,
   LiveAudienceList,
   CoGuestPanel,
+  CoHostPanel,
   AudioSettingPanel,
   VideoSettingPanel,
   MicButton,
@@ -94,4 +98,5 @@ export {
   useLiveAudienceState,
   useLiveMonitorState,
   useBarrageListState,
+  useBattleState,
 };

package/src/types/battle.ts

@@ -0,0 +1,12 @@
+export type BattleConfig =  {
+  duration: number;
+  needResponse: boolean;
+  extensionInfo: string;
+}
+
+export type BattleInfo = {
+  battleId: string;
+  config: BattleConfig;
+  startTime: number,
+  endTime: number;
+}

package/src/types/call.ts

@@ -0,0 +1,62 @@
+enum CallMediaType {
+  UNKNOWN = 0,
+  AUDIO = 1,
+  VIDEO = 2,
+}
+
+interface OfflinePushInfo {
+  title?: string;
+  description?: string;
+  androidOPPOChannelID?: string;
+  extension: string;
+  [key: string]: any;
+}
+
+type StartCallParams = {
+  type: CallMediaType;
+  userIDList: string[];
+  timeout?: number;
+  chatGroupID?: string;
+  offlinePushInfo?: OfflinePushInfo;
+  [key: string]: any;
+};
+
+interface CallData {
+  cmd: string;
+  inviter: string;
+  message: string;
+  room_id: number;
+  str_room_id: string;
+}
+
+interface CallInfo {
+  businessID: string;
+  call_end: number;
+  call_type: number;
+  data: CallData;
+  platform: string;
+  room_id: number;
+  userData: string;
+  version: number;
+  line_busy?: string | undefined;
+}
+
+interface DataContent {
+  actionType: number;
+  businessID: number;
+  data: CallInfo;
+  inviteID: string;
+  groupID: string;
+  inviter: string;
+  inviteeList: string[];
+  timeout: number;
+}
+
+interface CallMessagePayload {
+  data: DataContent;
+  description: string;
+  extension: string;
+}
+
+export { CallMediaType };
+export type { StartCallParams, OfflinePushInfo, CallMessagePayload };

package/src/types/coHost.ts

@@ -1,6 +1,48 @@
 export enum CoHostStatus {
-  Connected = 'Connected', // 在连线中
-  Disconnected = 'Disconnected', //  不在连线中
-  Invited = 'Invited', // 被其他主播邀请连线中
-  Requesting = 'Requesting', // 申请与其他主播连线中
+  Connected = 'Connected', // In connection
+  Disconnected = 'Disconnected', // Not in connection
+}
+
+export enum CoHostEvent {
+  /**
+   * @param {object} options
+   * @param {SeatUserInfo} options.inviter User info who initiated the request
+   * @param {string} options.extensionInfo Extension info
+   */
+  onCoHostRequestReceived = 'onCoHostRequestReceived',
+  /**
+   * @param {object} options
+   * @param {SeatUserInfo} options.inviter User info who initiated the request
+   */
+  onCoHostRequestCancelled = 'onCoHostRequestCancelled',
+  /**
+   * @param {object} options
+   * @param {SeatUserInfo} options.invitee User info who accepted the request
+   */
+  onCoHostRequestAccepted = 'onCoHostRequestAccepted',
+  /**
+   * @param {object} options
+   * @param {SeatUserInfo} options.invitee User info who rejected the request
+   */
+  onCoHostRequestRejected = 'onCoHostRequestRejected',
+  /**
+   * @param {object} options
+   * @param {SeatUserInfo} options.inviter User info who initiated the request
+   */
+  onCoHostRequestTimeout = 'onCoHostRequestTimeout',
+  /**
+   * @param {object} options
+   * @param {SeatUserInfo} options.userInfo User information
+  */
+  onCoHostUserJoined = 'onCoHostUserJoined',
+  /**
+   * @param {object} options
+   * @param {SeatUserInfo} options.userInfo User information
+  */
+  onCoHostUserLeft = 'onCoHostUserLeft',
+}
+
+export enum CoHostLayoutTemplate {
+  HostDynamicGrid = 600,
+  HostDynamic1v6 = 601,
 }

package/src/types/device.ts

@@ -51,3 +51,8 @@ export enum DeviceStatus {
   AdminInviting = "AdminInviting",   // 关闭状态且正在被主持人/管理员被邀请中
   UserApplying = "UserApplying", // 关闭状态且用户正在申请打开中
 }
+
+export enum DeviceStatusReason {
+  ChangedBySelf = 0,
+  ChangedByAdmin = 1,
+}

package/src/types/engine.ts

@@ -1,10 +1,43 @@
-import TUIChatEngine from '@tencentcloud/chat-uikit-engine';
+import ChatEngine from '@tencentcloud/chat-uikit-engine';
+import type { IConversationModel, IMessageModel } from '@tencentcloud/chat-uikit-engine';
+
+enum ConversationType {
+  C2C = ChatEngine.TYPES.CONV_C2C,
+  GROUP = ChatEngine.TYPES.CONV_GROUP,
+  SYSTEM = ChatEngine.TYPES.CONV_SYSTEM,
+}
+
+enum MessageType {
+  TEXT = ChatEngine.TYPES.MSG_TEXT,
+  IMAGE = ChatEngine.TYPES.MSG_IMAGE,
+  AUDIO = ChatEngine.TYPES.MSG_AUDIO,
+  VIDEO = ChatEngine.TYPES.MSG_VIDEO,
+  FILE = ChatEngine.TYPES.MSG_FILE,
+  FACE = ChatEngine.TYPES.MSG_FACE,
+  LOCATION = ChatEngine.TYPES.MSG_LOCATION,
+  GRP_TIP = ChatEngine.TYPES.MSG_GRP_TIP,
+  CUSTOM = ChatEngine.TYPES.MSG_CUSTOM,
+  MERGER = ChatEngine.TYPES.MSG_MERGER,
+}
+
+enum SearchType {
+  MESSAGE = 'message',
+  CHAT_MESSAGE = 'chat_message',
+  USER = 'user',
+  GROUP = 'group',
+}
+interface ConversationModel extends Omit<IConversationModel, 'type'> {
+  type: ConversationType;
+}
+
+interface MessageModel extends Omit<IMessageModel, 'type' | 'conversationType'> {
+  type: MessageType;
+  conversationType: ConversationType;
+}
 
 export type {
-  IConversationModel as ConversationModel,
   ISearchResult as SearchResult,
   ISearchParamsMap as SearchParamsMap,
-  IMessageModel as MessageModel,
   IGroupModel as GroupModel,
   ISearchCloudMessagesResultItem as SearchCloudMessagesResultItem,
   ISearchCloudUsersResultItem as SearchCloudUsersResultItem,
@@ -12,22 +45,13 @@ export type {
   CreateGroupParams,
 } from '@tencentcloud/chat-uikit-engine';
 
-export enum SearchType {
-  MESSAGE = 'message',
-  CHAT_MESSAGE = 'chat_message',
-  USER = 'user',
-  GROUP = 'group',
-}
+export type {
+  ConversationModel,
+  MessageModel,
+};
 
-export enum MessageType {
-  TEXT = TUIChatEngine.TYPES.MSG_TEXT,
-  IMAGE = TUIChatEngine.TYPES.MSG_IMAGE,
-  AUDIO = TUIChatEngine.TYPES.MSG_AUDIO,
-  VIDEO = TUIChatEngine.TYPES.MSG_VIDEO,
-  FILE = TUIChatEngine.TYPES.MSG_FILE,
-  FACE = TUIChatEngine.TYPES.MSG_FACE,
-  LOCATION = TUIChatEngine.TYPES.MSG_LOCATION,
-  GRP_TIP = TUIChatEngine.TYPES.MSG_GRP_TIP,
-  CUSTOM = TUIChatEngine.TYPES.MSG_CUSTOM,
-  MERGER = TUIChatEngine.TYPES.MSG_MERGER,
-}
+export {
+  ConversationType,
+  MessageType,
+  SearchType,
+};

package/src/types/index.ts

@@ -1,4 +1,14 @@
+// common
+export * from './login';
+// chat
 export * from './message';
+export * from './search';
+export * from './engine';
+export * from './conversation';
+export * from './contact';
+export * from './call';
+export * from './chatSetting';
+// live
 export * from './device';
 export * from './user';
 export * from './types';
@@ -10,9 +20,5 @@ export * from './audience';
 export * from './seat';
 export * from './monitor';
 export * from './coGuest';
-export * from './search';
-export * from './engine';
-export * from './login';
-export * from './conversation';
-export * from './contact';
-export * from './chatSetting';
+export * from './coHost';
+export * from './battle';

package/src/types/seat.ts

@@ -1,15 +1,15 @@
-import { DeviceStatus } from './device';
+import { DeviceStatus, DeviceStatusReason } from './device';
 
 export type SeatUserInfo = {
-  roomId: string;
+  liveId: string;
   userId: string;
   userName: string;
   avatarUrl: string;
   microphoneStatus: DeviceStatus;
+  microphoneStatusReason: DeviceStatusReason;
   cameraStatus: DeviceStatus;
-  onSeatTimestamp: number;
-  customInfo: Record<string, any>;
-};
+  cameraStatusReason: DeviceStatusReason;
+}
 
 export type RegionInfo = {
   x: number;

package/src/types/user.ts

@@ -45,10 +45,6 @@ export enum RequestType {
   Connection = 'Connection',
 }
 
-export interface BattleInfo {
-  score: number;
-}
-
 export interface UserInfo {
   // 基础信息
   userId: string;