群聊的聊天记录
+ +
+
+
+
+
+ + {{ content }} +
+聊天记录
+{{ props.type === 'friend' ? '好友通知' : '群通知' }}
- +- {{ groupStore.getUserInfo(isCurrentUser(item.uid) ? item.targetId : item.uid)!.name }} + {{ groupStore.getUserInfo(isCurrentUser(item.senderId) ? item.operateId : item.senderId)!.name }}
@@ -38,39 +46,53 @@
{{ formatTimestamp(item.createTime) }}
留言：{{ item.msg }}
++ 留言：{{ item.content }} +
+
+
+ 接受
+
+
+
+
+
+
+
+
+ 已同意
+
+
+ 已拒绝
+
+
+ 已忽略
+
+
+ {{
+ isAccepted(item)
+ ? '已同意'
+ : item.status === RequestNoticeAgreeStatus.REJECTED
+ ? '对方已拒绝'
+ : '等待验证'
+ }}
+
+
@@ -78,12 +100,12 @@
+
-
-
-
-
- 复制网址
-
-
+
+
+
+
+ 复制网址
+
+
+
{{ item }}
+
+
+ {{ item }}
+
+ class="text-(12px #909090) h-12px flex select-none"
+ :class="{
+ 'pr-48px justify-end': isMe,
+ 'pl-42px justify-start': !isMe
+ }">
{{ formatTimestamp(message.message.sendTime, true) }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+ ()
// 获取用户头像
@@ -340,7 +344,8 @@ const componentMap: Partial> = {
[MsgEnum.AUDIO_CALL]: AudioCall,
[MsgEnum.SYSTEM]: SystemMessage,
[MsgEnum.RECALL]: RecallMessage,
- [MsgEnum.BOT]: BotMessage
+ [MsgEnum.BOT]: BotMessage,
+ [MsgEnum.MERGE]: MergeMessage
}
const isSpecialMsgType = (type: number): boolean => {
@@ -349,7 +354,8 @@ const isSpecialMsgType = (type: number): boolean => {
type === MsgEnum.EMOJI ||
type === MsgEnum.NOTICE ||
type === MsgEnum.VIDEO ||
- type === MsgEnum.FILE
+ type === MsgEnum.FILE ||
+ type === MsgEnum.MERGE
)
}
diff --git a/src/components/rightBox/renderMessage/special/BotMessage.vue b/src/components/rightBox/renderMessage/special/BotMessage.vue
index 27f4894b66df8e2706a42186569b26bddddc2204..acdbf795ee637024e806b2dbe3c1f4e5534e3a44 100644
--- a/src/components/rightBox/renderMessage/special/BotMessage.vue
+++ b/src/components/rightBox/renderMessage/special/BotMessage.vue
@@ -1,18 +1,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ groupStore.getUserDisplayName(fromUser.uid) }}
-
-
-
- {{ groupStore.getUserDisplayName(fromUser.uid) }}
-
-
-
- ({{ groupStore.getUserInfo(fromUser.uid)?.locPlace }})
+
+
+ ({{ groupStore.getUserInfo(fromUser.uid)?.locPlace }})
+
+
+
+
+
+
+ {{ formatTimestamp(message.message.sendTime, true) }}
-
-
-
-
-
- {{ formatTimestamp(message.message.sendTime, true) }}
-
-
-
-
-
-
@@ -272,6 +273,7 @@ import { useGroupStore } from '@/stores/group'
import { useSettingStore } from '@/stores/setting'
import { AvatarUtils } from '@/utils/AvatarUtils'
import { formatTimestamp } from '@/utils/ComputedTime.ts'
+import { useChatStore } from '~/src/stores/chat'
import { useUserStore } from '~/src/stores/user'
import { markMsg } from '~/src/utils/ImRequestUtils'
import { isMac } from '~/src/utils/PlatformConstants'
@@ -280,6 +282,7 @@ import AudioCall from './AudioCall.vue'
import Emoji from './Emoji.vue'
import File from './File.vue'
import Image from './Image.vue'
+import MergeMessage from './MergeMessage.vue'
import BotMessage from './special/BotMessage.vue'
import RecallMessage from './special/RecallMessage.vue'
import SystemMessage from './special/SystemMessage.vue'
@@ -320,6 +323,7 @@ const settingStore = useSettingStore()
const { themes } = storeToRefs(settingStore)
const { optionsList, report, activeBubble, handleItemType, emojiList, specialMenuList, handleMsgClick } = useChatMain()
const groupStore = useGroupStore()
+const chatStore = useChatStore()
const recordEL = ref
+ 群主
+
+
+
+ 管理员
+
+
+
- 群主
-
-
-
- 管理员
-
-
-
-
-
+
+
+
diff --git a/src/mobile/components/my/PersonalInfo.vue b/src/mobile/components/my/PersonalInfo.vue
index 2d4bb2b0a930097672bda410e1bd818272e3f5c8..f8bf23870fd5f7e5c332c23bf96a1761855f09c8 100644
--- a/src/mobile/components/my/PersonalInfo.vue
+++ b/src/mobile/components/my/PersonalInfo.vue
@@ -7,56 +7,30 @@
-
- {{ part.text }}
-{{ part.text }}
-{{ part.text }}
+ class="chat-message-max-width dark:bg-[#fbb99020] bg-[#fbb99030] dark:border-(1px solid #fbb99020) border-(1px solid #fbb99040) flex-center chat-bot-message-gap px-12px py-4px rounded-8px"> +
+
+ {{ part.text }}
++ {{ part.text }} +
+{{ part.text }}
+
-
-
- {{ userStore.userInfo!.name }}
-
-
-
-
- {{ activeStatus === OnlineEnum.ONLINE ? '在线' : '离线' }}
-
-
-
-
-
-
-
-
-
-
-
- 在线
+ {{ userDetailInfo!.name }}
+
-
-
-
+
+ ![]()
+
+
+ {{ friendUserState.title ? friendUserState.title : currentState.title }}
+
- ![]()
-
-
- {{ currentStateTitle }}
-
- 账号:{{ userStore.userInfo!.account }}
+ 账号:{{ userDetailInfo!.account }}
@@ -68,14 +42,14 @@
style="transform: translateZ(0)"
class="relative w-118px overflow-hidden">
-
- 
@@ -68,14 +42,14 @@
style="transform: translateZ(0)"
class="relative w-118px overflow-hidden">
-
+
@@ -141,53 +123,133 @@
diff --git a/src/mobile/views/chat-room/MobileChatMain.vue b/src/mobile/views/chat-room/MobileChatMain.vue
index 18d09d3e22445db8820081839a2a046c66da200a..e17c92bcc7c3f03c1f0199e36f96e3d1577d6ede 100644
--- a/src/mobile/views/chat-room/MobileChatMain.vue
+++ b/src/mobile/views/chat-room/MobileChatMain.vue
@@ -1,7 +1,12 @@
-
+
已点亮
{{ userStore.userInfo?.itemIds?.length }}
枚勋章
-
- 还没获取任何勋章
+
+ 还没勋章哦~
@@ -99,41 +73,49 @@
920.13W
- 粉丝
+ 粉丝
120
- 关注
+ 关注
43.15W
- 点赞
+ 点赞
-
编辑资料
-
-
+
- - 删除好友
-
-
+
+
+ 添加好友
-
-
+
私聊
-
+
-
+
@@ -22,7 +22,7 @@
@@ -53,30 +51,24 @@
diff --git a/src/mobile/views/friends/AddFriends.vue b/src/mobile/views/friends/AddFriends.vue
index 73e88ffcf98837d1783a60023e1b8cbac3b6b058..6873f3379493f5e896667f5c6f3ee5b08e5c40a8 100644
--- a/src/mobile/views/friends/AddFriends.vue
+++ b/src/mobile/views/friends/AddFriends.vue
@@ -161,8 +161,8 @@ import { useSettingStore } from '@/stores/setting'
import { useUserStore } from '@/stores/user'
import { AvatarUtils } from '@/utils/AvatarUtils'
import { searchFriend, searchGroup } from '@/utils/ImRequestUtils'
+import router from '~/src/router'
-// const { createWebviewWindow } = useWindow()
const contactStore = useContactStore()
const userStore = useUserStore()
const globalStore = useGlobalStore()
@@ -398,15 +398,15 @@ const handleButtonClick = (item: any) => {
// 处理添加好友或群聊
const handleAddFriend = async (item: any) => {
if (searchType.value === 'user' || searchType.value === 'recommend') {
- // await createWebviewWindow('申请加好友', 'addFriendVerify', 380, 300, '', false, 380, 300)
- globalStore.addFriendModalInfo.show = true
globalStore.addFriendModalInfo.uid = item.uid
+
+ router.push('/mobile/mobileFriends/confirmAddFriend')
} else {
- // await createWebviewWindow('申请加群', 'addGroupVerify', 380, 400, '', false, 380, 400)
- globalStore.addGroupModalInfo.show = true
globalStore.addGroupModalInfo.account = item.account
globalStore.addGroupModalInfo.name = item.name
globalStore.addGroupModalInfo.avatar = item.avatar
+
+ router.push('/mobile/mobileFriends/confirmAddGroup')
}
}
diff --git a/src/mobile/views/friends/ConfirmAddFriend.vue b/src/mobile/views/friends/ConfirmAddFriend.vue
new file mode 100644
index 0000000000000000000000000000000000000000..02361707b939593b28ca94ffe7063e1baa5761b3
--- /dev/null
+++ b/src/mobile/views/friends/ConfirmAddFriend.vue
@@ -0,0 +1,97 @@
+
+
发布人:
- 卡仔
+ {{ groupStore.getUserInfo(item.uid)?.name }}
- 静夜思·李白 床前明月光，疑是地上霜。 举头望明月，低头思故乡。 静夜思·李白 床前明月光，疑是地上霜。
- 举头望明月，低头思故乡。 静夜思·李白 床前明月光，疑是地上霜。 举头望明月，低头思故乡。 静夜思·李白
- 床前明月光，疑是地上霜。 举头望明月，低头思故乡。
+ {{ item.content }}
- 2025年8月13日 17:25
- 3人已读
+ {{ formatTimestamp(item.createTime) }}
+ 128人已读
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mobile/views/friends/ConfirmAddGroup.vue b/src/mobile/views/friends/ConfirmAddGroup.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a43f6ba8ba205e2e3fe3da968de4bb021b29c0f6
--- /dev/null
+++ b/src/mobile/views/friends/ConfirmAddGroup.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加好友
+
+
+ {{ userInfo.name }}
+账号: {{ userInfo.account }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mobile/views/my/FriendInfo.vue b/src/mobile/views/friends/FriendInfo.vue
similarity index 97%
rename from src/mobile/views/my/FriendInfo.vue
rename to src/mobile/views/friends/FriendInfo.vue
index ae3a55fdd36c792f86f2197f683dd859f39b7ffd..ff7cded57a03f2761e774bd0be11416441eed4cf 100644
--- a/src/mobile/views/my/FriendInfo.vue
+++ b/src/mobile/views/friends/FriendInfo.vue
@@ -1,6 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
+ 申请加入
+
+
+ {{ userInfo.name }}
+群号: {{ userInfo.account }}
+
- (null)
diff --git a/src/mobile/views/friends/index.vue b/src/mobile/views/friends/index.vue
index 572840f500454747cbf76f8b13e126ed39f43894..df820e9871e18eb9b7dedbc8463ecaf938350918 100644
--- a/src/mobile/views/friends/index.vue
+++ b/src/mobile/views/friends/index.vue
@@ -49,34 +49,27 @@
@@ -35,7 +40,6 @@
import CommunityContent from '#/components/community/CommunityContent.vue'
import CommunityTab from '#/components/community/CommunityTab.vue'
import PersonalInfo from '#/components/my/PersonalInfo.vue'
-import SafeAreaPlaceholder from '#/components/placeholders/SafeAreaPlaceholder.vue'
const isShow = ref(true)
const avatarBox = ref
-
-
我的消息
-
-
-
-
-
-
-
- 99+
-
+
+
@@ -179,13 +172,23 @@ import NavBar from '#/layout/navBar/index.vue'
import addFriendIcon from '@/assets/mobile/chat-home/add-friend.webp'
import groupChatIcon from '@/assets/mobile/chat-home/group-chat.webp'
import { MittEnum, OnlineEnum, RoomTypeEnum } from '@/enums'
+import { useMessage } from '@/hooks/useMessage.ts'
import { useMitt } from '@/hooks/useMitt.ts'
import router from '@/router'
import { useContactStore } from '@/stores/contacts.ts'
import { useGroupStore } from '@/stores/group'
+import { useUserStore } from '@/stores/user'
import { useUserStatusStore } from '@/stores/userStatus'
import { AvatarUtils } from '@/utils/AvatarUtils'
+onMounted(async () => {
+ try {
+ await contactStore.getApplyPage(false)
+ } catch (error) {
+ console.log('请求好友申请列表失败')
+ }
+})
+
/**
* 渲染图片图标的函数工厂
* @param {string} src - 图标图片路径
@@ -230,8 +233,24 @@ const shrinkStatus = ref(false)
const groupStore = useGroupStore()
const contactStore = useContactStore()
const userStatusStore = useUserStatusStore()
+const userStore = useUserStore()
const { stateList } = storeToRefs(userStatusStore)
+//好友申请列表（只筛选好友申请消息）
+const applyList = computed(() => {
+ return contactStore.requestFriendsList.filter((item) => item.type === 2)
+})
+
+const avatarSrc = (url: string) => AvatarUtils.getAvatarUrl(url)
+
+const isCurrentUser = (uid: string) => {
+ return uid === userStore.userInfo!.uid
+}
+
+const toMessage = () => {
+ router.push('/mobile/mobileMy/myMessages')
+}
+
/** 群聊列表 */
const groupChatList = computed(() => {
return [...groupStore.groupDetails].sort((a, b) => {
@@ -261,23 +280,35 @@ watchEffect(() => {
})
})
+const { preloadChatRoom } = useMessage()
+
/**
*
* @param uid 群聊id或好友uid
* @param type 1 群聊 2 单聊
*/
-const handleClick = (uid: string, type: number) => {
+const handleClick = async (id: string, type: number) => {
detailsShow.value = true
- activeItem.value = uid
+ activeItem.value = id
const data = {
context: {
type: type,
- uid: uid
+ uid: id
},
detailsShow: detailsShow.value
}
useMitt.emit(MittEnum.DETAILS_SHOW, data)
- router.push('/mobile/mobileMy/friendInfo')
+
+ if (type === 1) {
+ try {
+ await preloadChatRoom(id)
+ router.push(`/mobile/chatRoom/chatMain`)
+ } catch (error) {
+ console.error(error)
+ }
+ } else {
+ router.push(`/mobile/mobileFriends/friendInfo/${id}`)
+ }
}
// todo 需要循环数组来展示分组
const showMenu = (event: MouseEvent) => {
diff --git a/src/mobile/views/my/MyMessages.vue b/src/mobile/views/my/MyMessages.vue
index 970d8e83370f9742a4c808e11e6045f87f1c0c3a..65f1bc5f1428284b80e8e24f94ab55bc61f95fa1 100644
--- a/src/mobile/views/my/MyMessages.vue
+++ b/src/mobile/views/my/MyMessages.vue
@@ -11,9 +11,20 @@
我的消息
+
+
-
+
-
-
-
-
-
@@ -21,127 +32,19 @@
diff --git a/src/mobile/views/my/index.vue b/src/mobile/views/my/index.vue
index 22e8e31e19e1b5f9ee09e3d475dc51916ddc02ac..bfe360c17a8b2055d8629c7fd28d1c87b0b9cbe2 100644
--- a/src/mobile/views/my/index.vue
+++ b/src/mobile/views/my/index.vue
@@ -2,7 +2,7 @@
+
+
+
+
-
+
=> [
path: 'SimpleBio',
name: 'mobileSimpleBio',
component: SimpleBio
- },
- {
- path: 'friendInfo',
- name: 'mobileFriendInfo',
- component: FriendInfo
}
]
},
@@ -217,6 +214,21 @@ const getMobileRoutes = (): Array => [
path: 'startGroupChat',
name: 'mobileStartGroupChat',
component: StartGroupChat
+ },
+ {
+ path: 'confirmAddFriend',
+ name: 'mobileConfirmAddFriend',
+ component: ConfirmAddFriend
+ },
+ {
+ path: 'confirmAddGroup',
+ name: 'mobileConfirmAddGroup',
+ component: ConfirmAddGroup
+ },
+ {
+ path: 'friendInfo/:uid',
+ name: 'mobileFriendInfo',
+ component: FriendInfo
}
]
}
@@ -318,6 +330,11 @@ const getDesktopRoutes = (): Array => [
name: 'loginSetting',
component: () => import('@/views/moreWindow/settings/LoginSetting.vue')
},
+ {
+ path: '/notification',
+ name: 'notification',
+ component: () => import('@/views/moreWindow/settings/Notification.vue')
+ },
{
path: '/versatile',
name: 'versatile',
@@ -355,6 +372,12 @@ const getDesktopRoutes = (): Array => [
name: 'rtcCall',
component: () => import('@/views/callWindow/index.vue')
},
+ // 添加聊天记录窗口路由
+ {
+ path: '/multiMsg',
+ name: 'multiMsg',
+ component: () => import('@/views/multiMsgWindow/index.vue')
+ },
{
path: '/searchFriend',
name: 'searchFriend',
@@ -464,8 +487,7 @@ const router: any = createRouter({
// 在创建路由后，添加全局前置守卫
// 为解决 “已声明‘to’，但从未读取其值” 的问题，将 to 参数改为下划线开头表示该参数不会被使用
-router.beforeEach(async (to: RouteLocationNormalized, from: RouteLocationNormalized, next: NavigationGuardNext) => {
- console.log('进入了路由：', from, to)
+router.beforeEach(async (to: RouteLocationNormalized, _from: RouteLocationNormalized, next: NavigationGuardNext) => {
// 桌面端直接放行
if (!isMobile) {
return next()
diff --git a/src/services/tauriCommand.ts b/src/services/tauriCommand.ts
new file mode 100644
index 0000000000000000000000000000000000000000..1a10c5888d2a5d671523bc259a04e5904e8ed5a6
--- /dev/null
+++ b/src/services/tauriCommand.ts
@@ -0,0 +1,32 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export type Settings = {
+ database: {
+ sqlite_file: string
+ }
+ backend: {
+ base_url: string
+ ws_url: string
+ }
+ youdao: {
+ app_key: string
+ app_secret: string
+ }
+ tencent: {
+ api_key: string
+ secret_id: string
+ }
+}
+
+export type UpdateSettingsParams = {
+ baseUrl: string
+ wsUrl: string
+}
+
+export const getSettings = async (): Promise => {
+ return await invoke('get_settings')
+}
+
+export const updateSettings = async (settings: UpdateSettingsParams) => {
+ return await invoke('update_settings', { settings })
+}
diff --git a/src/services/translate.ts b/src/services/translate.ts
index bfa0d008047f02d3fdc8a33bca90890eb7cfd68b..456e83f720978fbf70c0b3c7908118e171ca9e7b 100644
--- a/src/services/translate.ts
+++ b/src/services/translate.ts
@@ -1,6 +1,7 @@
import { fetch } from '@tauri-apps/plugin-http'
import CryptoJS from 'crypto-js'
import { AppException } from '@/common/exception.ts'
+import { getSettings, type Settings } from '@/services/tauriCommand.ts'
import type { TranslateProvider } from './types.ts'
// 有道云翻译接口响应类型
@@ -133,11 +134,10 @@ export const translateText = async (text: string, provider: TranslateProvider =
*/
const youdaoTranslate = async (text: string): Promise => {
// 从环境变量获取密钥信息
- const appKey = import.meta.env.VITE_YOUDAO_APP_KEY
- const appSecret = import.meta.env.VITE_YOUDAO_APP_SECRET
+ const settings: Settings = await getSettings()
// 检查密钥是否为空
- if (!appKey || !appSecret) {
+ if (!settings.youdao.app_key || !settings.youdao.app_secret) {
throw window.$message?.error('有道翻译API密钥未配置')
}
@@ -145,7 +145,7 @@ const youdaoTranslate = async (text: string): Promise => {
const curtime = Math.round(new Date().getTime() / 1000) // 当前时间戳
// 计算签名
- const sign = signUtils.getYoudaoSign(text, appKey, salt, curtime, appSecret)
+ const sign = signUtils.getYoudaoSign(text, settings.youdao.app_key, salt, curtime, settings.youdao.app_secret)
// 发送翻译请求
const response = await fetch('https://openapi.youdao.com/api', {
@@ -157,7 +157,7 @@ const youdaoTranslate = async (text: string): Promise => {
q: text, // 待翻译文本
from: 'auto', // 源语言
to: 'zh-CHS', // 目标语言
- appKey, // 应用ID
+ appKey: settings.youdao.app_key, // 应用ID
salt: salt.toString(), // 随机数
sign, // 签名
signType: 'v3', // 签名类型
@@ -190,8 +190,9 @@ const youdaoTranslate = async (text: string): Promise => {
*/
const tencentTranslate = async (text: string): Promise => {
// 从环境变量获取密钥信息
- const secretId = import.meta.env.VITE_TENCENT_SECRET_ID
- const secretKey = import.meta.env.VITE_TENCENT_API_KEY
+ const settings: Settings = await getSettings()
+ const secretId = settings.tencent.secret_id
+ const secretKey = settings.tencent.api_key
// 检查密钥是否为空
if (!secretId || !secretKey) {
diff --git a/src/services/types.ts b/src/services/types.ts
index c5b935977c15b56b6677a97d43b69093a823f085..00c40147a0f5eb124a17a194ba833d8fa774a66a 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -323,12 +323,13 @@ export type MessageType = {
/** 消息主体 */
message: MsgType
/** 发送时间 */
- sendTime: string
+ sendTime: number
/** 时间段（可选） */
- timeBlock?: string
+ timeBlock?: number
/** 是否加载中 */
loading?: boolean
uploadProgress?: number
+ isCheck?: boolean
}
/**
@@ -378,6 +379,16 @@ export type VoiceBody = {
second: number
url: string
}
+
+export type MergeBodyBody = {
+ messageId: string
+ uid: string
+}
+
+export type MergeBody = {
+ body: MergeBodyBody[]
+ content: string[]
+}
/** 视频 */
export type VideoBody = {
size: number
@@ -479,16 +490,32 @@ export type MessageReq = {
}
}
-/** 申请状态 */
-export enum RequestFriendAgreeStatus {
- /** 1待审批 */
- Waiting = 1,
- /** 2同意 */
- Agree,
- /** 3拒绝 */
- Reject,
- /** 4忽略 */
- Ignore
+/** 通知状态 */
+export enum RequestNoticeAgreeStatus {
+ /** 待审批 */
+ UNTREATED = 0,
+ /** 同意 */
+ ACCEPTED,
+ /** 拒绝 */
+ REJECTED,
+ /** 忽略 */
+ IGNORE
+}
+
+/** 通知事件 */
+export enum NoticeType {
+ /** 好友申请 */
+ FRIEND_APPLY = 1,
+ /** 好友被申请 */
+ ADD_ME = 6,
+ /** 加群申请 */
+ GROUP_APPLY = 2,
+ /** 群邀请 */
+ GROUP_INVITE = 3,
+ /** 被邀请进群 */
+ GROUP_INVITE_ME = 7,
+ /** 移除群成员 */
+ GROUP_MEMBER_DELETE = 5
}
/** 请求添加好友的列表项 */
@@ -498,7 +525,7 @@ export type RequestFriendItem = {
/** 申请信息 */
msg: string
/** 申请状态 1待审批 2同意 3拒绝 4忽略 */
- status: RequestFriendAgreeStatus
+ status: RequestNoticeAgreeStatus
/** 申请类型 1加好友 */
type: number
/** 申请人uid */
@@ -510,6 +537,32 @@ export type RequestFriendItem = {
/** 会话 ID */
roomId: string
}
+
+export interface NoticeItem {
+ /** 实体ID */
+ id?: string
+ /** 通知类型:1-好友申请;2-群申请;3-群邀请;5-移除群成员;6-好友被申请;7-被邀请进群 */
+ eventType: number
+ /** 通知类型 1群聊 2加好友 */
+ type: number
+ /** 发起人UID */
+ senderId: string
+ /** 接收人UID */
+ receiverId: string
+ /** 申请ID */
+ applyId: string
+ /** 被操作的人 */
+ operateId?: string
+ /** 通知内容 申请时填写的 */
+ content: string
+ /** 处理状态:0-未处理;1-已同意;2-已拒绝;3-忽略 */
+ status: number
+ /** 是否已读 */
+ isRead: boolean
+ /** 创建时间 */
+ createTime?: number
+}
+
/** 联系人的列表项 */
export type ContactItem = {
/** 在线状态 1在线 2离线 */
@@ -569,6 +622,8 @@ export type SessionItem = {
remark?: string
/** 我的群昵称 */
myName?: string
+ /** 是否选中（非后端） */
+ isCheck?: boolean
}
/** 消息已读未读数列表项 */
diff --git a/src/services/webSocketRust.ts b/src/services/webSocketRust.ts
index 8c74fd03c0cd9b8d0a8309254b12c17f6fd0e44d..bdb35d5705c4f07ebca575ab77d0a3d0b30e7d27 100644
--- a/src/services/webSocketRust.ts
+++ b/src/services/webSocketRust.ts
@@ -104,21 +104,8 @@ class RustWebSocketClient {
async initConnect(): Promise {
try {
const clientId = localStorage.getItem('clientId')
- const savedProxy = localStorage.getItem('proxySettings')
-
- let serverUrl = import.meta.env.VITE_WEBSOCKET_URL
-
- // 处理代理设置
- if (savedProxy) {
- const settings = JSON.parse(savedProxy)
- const suffix = settings.wsIp + ':' + settings.wsPort + '/websocket/' + settings.wsSuffix
- if (settings.wsType === 'ws' || settings.wsType === 'wss') {
- serverUrl = settings.wsType + '://' + suffix
- }
- }
const params = {
- serverUrl,
clientId: clientId || ''
}
@@ -126,9 +113,6 @@ class RustWebSocketClient {
await invoke('ws_init_connection', { params })
- // await this.setupEventListener()
-
- // this.isInitialized = true
info('[RustWS] WebSocket 连接初始化成功')
} catch (err) {
error(`[RustWS] 连接初始化失败: ${err}`)
diff --git a/src/stores/chat.ts b/src/stores/chat.ts
index e9106cd69689d455a50fb99de8f5eb7c06700949..d612ec3b018d307709b4c2191a07e5f4cddb8e1b 100644
--- a/src/stores/chat.ts
+++ b/src/stores/chat.ts
@@ -30,10 +30,10 @@ let isFirstInit = false
// 撤回消息的过期时间
const RECALL_EXPIRATION_TIME = 2 * 60 * 1000 // 2分钟，单位毫秒
-// 定义消息数量阈值
-const MESSAGE_THRESHOLD = 120
-// 定义保留的最新消息数量
-const KEEP_MESSAGE_COUNT = 60
+// // 定义消息数量阈值
+// const MESSAGE_THRESHOLD = 120
+// // 定义保留的最新消息数量
+// const KEEP_MESSAGE_COUNT = 60
// 创建src/workers/timer.worker.ts
const timerWorker = new Worker(new URL('../workers/timer.worker.ts', import.meta.url))
@@ -69,19 +69,11 @@ export const useChatStore = defineStore(
const recalledMessages = reactive>(new Map())
// 存储每条撤回消息的过期定时器
const expirationTimers = new Map()
+ const isMsgMultiChoose = ref(false)
// 当前聊天室的消息Map计算属性
- const currentMessageMap = computed({
- get: () => {
- const current = messageMap.get(globalStore.currentSession!.roomId)
- if (current === undefined) {
- messageMap.set(globalStore.currentSession!.roomId, new Map())
- }
- return messageMap.get(globalStore.currentSession!.roomId)
- },
- set: (val) => {
- messageMap.set(globalStore.currentSession!.roomId, val as Map)
- }
+ const currentMessageMap = computed(() => {
+ return messageMap.get(globalStore.currentSession!.roomId)
})
// 当前聊天室的消息加载状态计算属性
@@ -115,6 +107,11 @@ export const useChatStore = defineStore(
}
})
+ // 判断是否应该显示“没有更多消息”
+ const shouldShowNoMoreMessage = computed(() => {
+ return currentMessageOptions.value?.isLast
+ })
+
// 判断当前是否为群聊
const isGroup = computed(() => globalStore.currentSession?.type === RoomTypeEnum.GROUP)
@@ -183,17 +180,17 @@ export const useChatStore = defineStore(
// 当前消息回复
const currentMsgReply = ref>({})
- // 将消息列表转换为数组
+ // 将消息列表转换为数组并计算时间间隔
const chatMessageList = computed(() => {
- return currentMessageMap.value
- ? [...currentMessageMap.value.values()].sort((a, b) => Number(a.message.id) - Number(b.message.id))
- : []
+ if (!currentMessageMap.value) return []
+
+ return [...currentMessageMap.value.values()].sort((a, b) => Number(a.message.id) - Number(b.message.id))
})
const chatMessageListByRoomId = computed(() => (roomId: string) => {
- return messageMap.get(roomId)
- ? [...messageMap.get(roomId)!.values()].sort((a, b) => Number(a.message.id) - Number(b.message.id))
- : []
+ if (!messageMap.get(roomId)) return []
+
+ return [...messageMap.get(roomId)!.values()].sort((a, b) => Number(a.message.id) - Number(b.message.id))
})
// 登录之后，加载一次所有会话的消息
@@ -254,7 +251,6 @@ export const useChatStore = defineStore(
try {
if (sessionOptions.isLoading) return
sessionOptions.isLoading = true
- console.log('获取会话列表')
const response: any = await invokeWithErrorHandler(TauriCommand.LIST_CONTACTS, undefined, {
customErrorMessage: '获取会话列表失败',
errorType: ErrorType.Network
@@ -356,16 +352,6 @@ export const useChatStore = defineStore(
const current = messageMap.get(msg.message.roomId)
current?.set(msg.message.id, msg)
- // 检查消息数量是否超过阈值
- if (current && current.size > MESSAGE_THRESHOLD) {
- // 获取所有消息ID并按时间排序
- const messageIds = Array.from(current.keys())
- const messagesToDelete = messageIds.slice(0, messageIds.length - KEEP_MESSAGE_COUNT)
-
- // 删除旧消息
- messagesToDelete.forEach((id) => current.delete(id))
- }
-
// 获取用户信息缓存
const uid = msg.fromUser.uid
const cacheUser = groupStore.getUserInfo(uid)
@@ -412,6 +398,10 @@ export const useChatStore = defineStore(
}
}
+ const clearSessionCheck = () => {
+ sessionList.value.forEach((item) => (item.isCheck = false))
+ }
+
// 过滤掉拉黑用户的发言
const filterUser = (uid: string) => {
for (const messages of messageMap.values()) {
@@ -573,14 +563,6 @@ export const useChatStore = defineStore(
}
}
- // 添加一个工具函数来触发消息列表更新
- const triggerMessageMapUpdate = () => {
- if (currentMessageMap.value) {
- const newMap = new Map(currentMessageMap.value)
- currentMessageMap.value = newMap
- }
- }
-
// 获取撤回消息
const getRecalledMessage = (msgId: string): RecalledMessage | undefined => {
return recalledMessages.get(msgId)
@@ -597,17 +579,20 @@ export const useChatStore = defineStore(
status,
newMsgId,
body,
- uploadProgress
+ uploadProgress,
+ timeBlock
}: {
msgId: string
status: MessageStatusEnum
newMsgId?: string
body?: any
uploadProgress?: number
+ timeBlock?: number
}) => {
const msg = currentMessageMap.value?.get(msgId)
if (msg) {
msg.message.status = status
+ msg.timeBlock = timeBlock
if (newMsgId) {
msg.message.id = newMsgId
}
@@ -652,6 +637,10 @@ export const useChatStore = defineStore(
const index = sessionList.value.findIndex((session) => session.roomId === roomId)
if (index !== -1) {
sessionList.value.splice(index, 1)
+ if (globalStore.currentSessionRoomId === roomId) {
+ globalStore.updateCurrentSessionRoomId(sessionList.value[0].roomId)
+ }
+
// 删除会话后更新未读计数
nextTick(() => {
updateTotalUnreadCount()
@@ -667,7 +656,6 @@ export const useChatStore = defineStore(
console.log(`[Timeout] 消息ID: ${msgId} 已过期`)
recalledMessages.delete(msgId)
expirationTimers.delete(msgId)
- triggerMessageMapUpdate()
} else if (type === 'allTimersCompleted') {
// 所有定时器都完成了，可以安全地清理资源
clearAllExpirationTimers()
@@ -736,38 +724,34 @@ export const useChatStore = defineStore(
const requestRoomId = globalStore.currentSession!.roomId
try {
- // 1. 清空当前消息列表
- if (currentMessageMap.value) {
- currentMessageMap.value.clear()
- }
+ // 1. 清空消息数据 避免竞态条件
+ const currentMessages = messageMap.get(requestRoomId)
+ currentMessages?.clear() // 如果Map存在就清空，不存在getPageMsg会自动创建
- // 2. 重置消息加载状态
- if (currentMessageOptions.value) {
- currentMessageOptions.value = {
- isLast: false,
- isLoading: true,
- cursor: ''
- }
- }
+ // 2. 重置消息加载状态，强制cursor为空以获取最新消息
+ messageOptions.set(requestRoomId, {
+ isLast: false,
+ isLoading: true,
+ cursor: ''
+ })
// 3. 清空回复映射
- if (currentReplyMap.value) {
- currentReplyMap.value.clear()
- }
+ const currentReplyMapping = replyMapping.get(requestRoomId)
+ currentReplyMapping?.clear()
- // 4. 从服务器获取最新的消息（默认20条）
- await getMsgList(pageSize)
+ // 4. 直接调用getPageMsg获取最新消息，强制使用空cursor
+ await getPageMsg(pageSize, requestRoomId, '')
console.log('[Network] 已重置并刷新当前聊天室的消息列表')
} catch (error) {
console.error('[Network] 重置并刷新消息列表失败:', error)
// 如果获取失败，确保重置加载状态
- if (globalStore.currentSession!.roomId === requestRoomId && currentMessageOptions.value) {
- currentMessageOptions.value = {
+ if (globalStore.currentSession!.roomId === requestRoomId) {
+ messageOptions.set(requestRoomId, {
isLast: false,
isLoading: false,
cursor: ''
- }
+ })
}
}
}
@@ -777,9 +761,9 @@ export const useChatStore = defineStore(
return sessionList.value.filter((session) => session.type === RoomTypeEnum.GROUP)
}
- const shouldShowNoMoreMessage = computed(() => {
- return currentMessageOptions.value?.isLast
- })
+ const setMsgMultiChoose = (flag: boolean) => {
+ isMsgMultiChoose.value = flag
+ }
return {
getMsgIndex,
@@ -822,7 +806,10 @@ export const useChatStore = defineStore(
addSession,
setAllSessionMsgList,
chatMessageListByRoomId,
- shouldShowNoMoreMessage
+ shouldShowNoMoreMessage,
+ isMsgMultiChoose,
+ clearSessionCheck,
+ setMsgMultiChoose
}
},
{
diff --git a/src/stores/contacts.ts b/src/stores/contacts.ts
index 74af4b8efc54965e195eca49ab8352eb5e650217..b913329e1d1cb80a114848d0c5b3cec5c8c3ac37 100644
--- a/src/stores/contacts.ts
+++ b/src/stores/contacts.ts
@@ -1,14 +1,14 @@
import { defineStore } from 'pinia'
import { StoresEnum } from '@/enums'
-import type { ContactItem, RequestFriendItem } from '@/services/types'
-import { RequestFriendAgreeStatus } from '@/services/types'
+import type { ContactItem, NoticeItem } from '@/services/types'
+import { RequestNoticeAgreeStatus } from '@/services/types'
import { useGlobalStore } from '@/stores/global'
import {
deleteFriend,
getApplyUnreadCount,
getFriendPage,
handleInvite,
- requestApplyPage
+ requestNoticePage
} from '@/utils/ImRequestUtils'
// 定义分页大小常量
export const pageSize = 20
@@ -18,7 +18,7 @@ export const useContactStore = defineStore(StoresEnum.CONTACTS, () => {
/** 联系人列表 */
const contactsList = ref([])
/** 好友请求列表 */
- const requestFriendsList = ref([])
+ const requestFriendsList = ref([])
/** 联系人列表分页选项 */
const contactsOptions = ref({ isLast: false, isLoading: false, cursor: '' })
@@ -79,7 +79,7 @@ export const useContactStore = defineStore(StoresEnum.CONTACTS, () => {
}
try {
- const res = await requestApplyPage({
+ const res = await requestNoticePage({
pageNo: applyPageOptions.value.pageNo,
pageSize: 30,
cursor: isFresh ? '' : applyPageOptions.value.cursor
@@ -125,7 +125,7 @@ export const useContactStore = defineStore(StoresEnum.CONTACTS, () => {
if (globalStore.currentSelectedContact) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
- globalStore.currentSelectedContact.status = RequestFriendAgreeStatus.Agree
+ globalStore.currentSelectedContact.status = RequestNoticeAgreeStatus.ACCEPTED
}
// 获取最新的未读数
await getApplyUnReadCount()
diff --git a/src/stores/group.ts b/src/stores/group.ts
index 2c349722f36fffc7fff292155e24a9b8c8d9d572..4330f0d08b34f8e4ac4d5dc60c4deda8e23d33aa 100644
--- a/src/stores/group.ts
+++ b/src/stores/group.ts
@@ -206,10 +206,16 @@ export const useGroupStore = defineStore(
return groupDetails.value.find((item: GroupDetailReq) => item.roomId === globalStore.currentSession!.roomId)
})
+ const getGroupDetailByRoomId = computed(() => (roomId: string) => {
+ return groupDetails.value.find((item: GroupDetailReq) => item.roomId === roomId)
+ })
+
const updateGroupNumber = (roomId: string, totalNum: number, onlineNum: number) => {
const group = groupDetails.value.find((item) => item.roomId === roomId)
- group!.memberNum = totalNum
- group!.onlineNum = onlineNum
+ if (group) {
+ group.memberNum = totalNum
+ group.onlineNum = onlineNum
+ }
}
/**
@@ -526,6 +532,7 @@ export const useGroupStore = defineStore(
setGroupDetails,
updateGroupDetail,
groupDetails,
+ getGroupDetailByRoomId,
updateGroupNumber,
removeGroupDetail,
addGroupDetail,
diff --git a/src/stores/setting.ts b/src/stores/setting.ts
index 12341092b2e4f0e54b4c00b45796a99931efb947..6c933c0410dec7cb8177f88ce3424cbf245c119d 100644
--- a/src/stores/setting.ts
+++ b/src/stores/setting.ts
@@ -37,7 +37,7 @@ export const useSettingStore = defineStore(StoresEnum.SETTING, {
chat: {
sendKey: 'Enter',
isDouble: true,
- translate: 'tencent'
+ translate: 'youdao'
},
shortcuts: getDefaultShortcuts(),
page: {
@@ -50,6 +50,9 @@ export const useSettingStore = defineStore(StoresEnum.SETTING, {
},
screenshot: {
isConceal: false
+ },
+ notification: {
+ messageSound: true
}
}),
actions: {
@@ -98,7 +101,7 @@ export const useSettingStore = defineStore(StoresEnum.SETTING, {
/** 设置发送消息快捷键 */
setSendMessageShortcut(shortcut: string) {
if (!this.chat) {
- this.chat = { sendKey: 'Enter', isDouble: true, translate: 'tencent' }
+ this.chat = { sendKey: 'Enter', isDouble: true, translate: 'youdao' }
}
this.chat.sendKey = shortcut
},
@@ -118,6 +121,13 @@ export const useSettingStore = defineStore(StoresEnum.SETTING, {
this.screenshot = { isConceal: false }
}
this.screenshot.isConceal = isConceal
+ },
+ /** 设置消息提示音开关 */
+ setMessageSoundEnabled(enabled: boolean) {
+ if (!this.notification) {
+ this.notification = { messageSound: true }
+ }
+ this.notification.messageSound = enabled
}
},
share: {
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 0ea76364f1f464c34152cfa6e801135735a57688..e405f56feb2211a903b9debce8831c70c2bcd513 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -18,7 +18,11 @@ export const useUserStore = defineStore(
})
}
- return { userInfo, getUserDetailAction }
+ const isMe = computed(() => (id: string) => {
+ return userInfo.value?.uid === id
+ })
+
+ return { userInfo, getUserDetailAction, isMe }
},
{
share: {
diff --git a/src/strategy/MessageStrategy.ts b/src/strategy/MessageStrategy.ts
index 03a468f023da2ac67c894df8fd4e6a635c19a428..c07a033326edd6c6f0ab31bf8ed8f3149780944f 100644
--- a/src/strategy/MessageStrategy.ts
+++ b/src/strategy/MessageStrategy.ts
@@ -59,7 +59,7 @@ abstract class AbstractMessageStrategy implements MessageStrategy {
body: messageBody,
messageMarks: {}
},
- sendTime: new Date(currentTime).toISOString(),
+ sendTime: Date.now(),
loading: false
}
}
diff --git a/src/styles/scss/global/desktop.scss b/src/styles/scss/global/desktop.scss
index d707feeffcf10fe0c8ed9926827b31660bd014c6..0d02693e1d6c604d9429dac3b310c0e56d584ffe 100644
--- a/src/styles/scss/global/desktop.scss
+++ b/src/styles/scss/global/desktop.scss
@@ -16,4 +16,12 @@ body {
left: 0;
transition: all 0.9s ease;
border-radius: 10px;
-}
\ No newline at end of file
+}
+
+.chat-message-max-width{
+ max-width: fit-content;
+}
+
+.chat-bot-message-gap{
+ gap: 8px;
+}
diff --git a/src/styles/scss/global/mobile.scss b/src/styles/scss/global/mobile.scss
index 0a5ea8f016d3c0ae5cfad1bd269115aacee51163..99594aa759788191fb6fa2d51dc9b760d25c3caa 100644
--- a/src/styles/scss/global/mobile.scss
+++ b/src/styles/scss/global/mobile.scss
@@ -27,3 +27,11 @@
.n-message-container.n-message-container--top {
top: var(--safe-area-inset-top);
}
+
+.chat-message-max-width{
+ max-width: fit-content;
+}
+
+.chat-bot-message-gap{
+ gap: 4px;
+}
diff --git a/src/styles/scss/global/variable.scss b/src/styles/scss/global/variable.scss
index fdd8ddc4217d6fd001ebe0d2dc670c8762839653..d28cf561e02118ba0b122a304528662fa34eeed8 100644
--- a/src/styles/scss/global/variable.scss
+++ b/src/styles/scss/global/variable.scss
@@ -37,7 +37,7 @@ svg {
--action-bar-icon-color: #404040;
--action-bar-icon-hover: #e7e7e7;
// 搜索框背景颜色
- --search-bg-color: #f3f3f3;
+ --search-bg-color: #EAEAEA;
// 消息列表样式
--bg-msg-first-child: #eeeeee;
--bg-msg-hover: #f3f3f3;
@@ -129,6 +129,7 @@ svg {
--safe-area-inset-right: 0px;
--safe-area-inset-bottom: 16px;
--safe-area-inset-left: 0px;
+ --van-dialog-confirm-button-text-color: #169b80;
}
html[data-theme='dark'] {
diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts
index 868e6185a124cc91078b313b624cad324b6e2432..1b9e9b6d9035fb92a4e15549802215168f6251ec 100644
--- a/src/typings/components.d.ts
+++ b/src/typings/components.d.ts
@@ -19,6 +19,8 @@ declare module 'vue' {
ChatFooter: typeof import('./../components/rightBox/chatBox/ChatFooter.vue')['default']
ChatHeader: typeof import('./../components/rightBox/chatBox/ChatHeader.vue')['default']
ChatMain: typeof import('./../components/rightBox/chatBox/ChatMain.vue')['default']
+ ChatMsgMultiChoose: typeof import('./../components/rightBox/chatBox/ChatMsgMultiChoose.vue')['default']
+ ChatMultiMsg: typeof import('./../components/rightBox/chatBox/ChatMultiMsg.vue')['default']
ChatSidebar: typeof import('./../components/rightBox/chatBox/ChatSidebar.vue')['default']
Community: typeof import('./../mobile/components/my/community.vue')['default']
CommunityContent: typeof import('./../mobile/components/community/CommunityContent.vue')['default']
@@ -36,11 +38,13 @@ declare module 'vue' {
InfoPopover: typeof import('./../components/common/InfoPopover.vue')['default']
LoadingSpinner: typeof import('./../components/common/LoadingSpinner.vue')['default']
MeasuredItem: typeof import('./../mobile/components/virtual-scroll/MeasuredItem.vue')['default']
+ MergeMessage: typeof import('./../components/rightBox/renderMessage/MergeMessage.vue')['default']
MessageContainer: typeof import('./../mobile/components/chat-room/MessageContainer.vue')['default']
- MessageContent: typeof import('./../components/rightBox/chatBox/MessageContent.vue')['default']
+ MobileApplyList: typeof import('./../mobile/components/my/MobileApplyList.vue')['default']
MsgInput: typeof import('./../components/rightBox/MsgInput.vue')['default']
MyMessageItem: typeof import('./../mobile/components/my/MyMessageItem.vue')['default']
NaiveProvider: typeof import('./../components/common/NaiveProvider.vue')['default']
+ NAlert: typeof import('naive-ui')['NAlert']
NAutoComplete: typeof import('naive-ui')['NAutoComplete']
NAvatar: typeof import('naive-ui')['NAvatar']
NAvatarGroup: typeof import('naive-ui')['NAvatarGroup']
@@ -55,13 +59,13 @@ declare module 'vue' {
NConfigProvider: typeof import('naive-ui')['NConfigProvider']
NDatePicker: typeof import('naive-ui')['NDatePicker']
NDialogProvider: typeof import('naive-ui')['NDialogProvider']
+ NDivider: typeof import('naive-ui')['NDivider']
NDrawer: typeof import('naive-ui')['NDrawer']
NDrawerContent: typeof import('naive-ui')['NDrawerContent']
NDropdown: typeof import('naive-ui')['NDropdown']
NEllipsis: typeof import('naive-ui')['NEllipsis']
NEmpty: typeof import('naive-ui')['NEmpty']
NFlex: typeof import('naive-ui')['NFlex']
- NFloatButton: typeof import('naive-ui')['NFloatButton']
NForm: typeof import('naive-ui')['NForm']
NFormItem: typeof import('naive-ui')['NFormItem']
NHighlight: typeof import('naive-ui')['NHighlight']
@@ -80,6 +84,7 @@ declare module 'vue' {
NPopover: typeof import('naive-ui')['NPopover']
NPopselect: typeof import('naive-ui')['NPopselect']
NProgress: typeof import('naive-ui')['NProgress']
+ NQrCode: typeof import('naive-ui')['NQrCode']
NRadio: typeof import('naive-ui')['NRadio']
NRadioGroup: typeof import('naive-ui')['NRadioGroup']
NResult: typeof import('naive-ui')['NResult']
@@ -88,6 +93,10 @@ declare module 'vue' {
NSkeleton: typeof import('naive-ui')['NSkeleton']
NSpace: typeof import('naive-ui')['NSpace']
NSpin: typeof import('naive-ui')['NSpin']
+ NSpliter: typeof import('naive-ui')['NSpliter']
+ NSplitter: typeof import('naive-ui')['NSplitter']
+ NStep: typeof import('naive-ui')['NStep']
+ NSteps: typeof import('naive-ui')['NSteps']
NSwitch: typeof import('naive-ui')['NSwitch']
NTab: typeof import('naive-ui')['NTab']
NTabPane: typeof import('naive-ui')['NTabPane']
@@ -111,16 +120,11 @@ declare module 'vue' {
Settings: typeof import('./../mobile/components/my/Settings.vue')['default']
ShareModal: typeof import('./../mobile/components/my/ShareModal.vue')['default']
SmartVirtualList: typeof import('./../mobile/components/virtual-scroll/SmartVirtualList.vue')['default']
- SwipContainer: typeof import('./../mobile/components/swipe/SwipContainer.vue')['default']
- SwipeContainer: typeof import('./../mobile/components/swipe/SwipeContainer.vue')['default']
SystemMessage: typeof import('./../components/rightBox/renderMessage/special/SystemMessage.vue')['default']
Text: typeof import('./../components/rightBox/renderMessage/Text.vue')['default']
Validation: typeof import('./../components/common/Validation.vue')['default']
- VanCell: typeof import('vant/es')['Cell']
- VanCellGroup: typeof import('vant/es')['CellGroup']
- VanFloatingPopup: typeof import('vant/es')['FloatingPopup']
- VanPasswordInput: typeof import('vant/es')['PasswordInput']
VanSwipeCell: typeof import('vant/es')['SwipeCell']
+ VanUploader: typeof import('vant/es')['Uploader']
Video: typeof import('./../components/rightBox/renderMessage/Video.vue')['default']
VideoCall: typeof import('./../components/rightBox/renderMessage/VideoCall.vue')['default']
VirtualList: typeof import('./../components/common/VirtualList.vue')['default']
diff --git a/src/typings/global.d.ts b/src/typings/global.d.ts
index 1d807aa5cf850308db06f6c28dad8c0a6e98368b..57266bb7b0fe5411fb9d0de1b2b28729fc70b146 100644
--- a/src/typings/global.d.ts
+++ b/src/typings/global.d.ts
@@ -20,3 +20,19 @@ declare namespace Common {
/** 构建时间 */
declare const PROJECT_BUILD_TIME: string
+
+export type ProxySettings = {
+ apiType: string
+ apiIp: string
+ apiPort: string
+ apiSuffix: string
+ wsType: string
+ wsIp: string
+ wsPort: string
+ wsSuffix: string
+}
+
+export type MsgId = {
+ msgId: string
+ fromUid: string
+}
diff --git a/src/typings/stores.d.ts b/src/typings/stores.d.ts
index bd718ecf9e1069c440436379e82416fe52637093..99d54b40cf433d325fbfe1417169decd86b54845 100644
--- a/src/typings/stores.d.ts
+++ b/src/typings/stores.d.ts
@@ -80,6 +80,11 @@ declare namespace STO {
/** 截图时是否隐藏窗口 */
isConceal: boolean
}
+ /** 消息通知设置 */
+ notification: {
+ /** 是否开启消息提示音 */
+ messageSound: boolean
+ }
}
/**
diff --git a/src/utils/ComputedTime.ts b/src/utils/ComputedTime.ts
index ebfde64cb3faf54cbf2107c6202e047ce426bb35..8fbc06f486618d8ee9af67fdfc1a5a0d585c8a7e 100644
--- a/src/utils/ComputedTime.ts
+++ b/src/utils/ComputedTime.ts
@@ -2,21 +2,14 @@ import dayjs from 'dayjs'
import weekday from 'dayjs/plugin/weekday'
import 'dayjs/locale/zh-cn' // 导入中文语言包
import type { ConfigType, Dayjs, OpUnitType } from 'dayjs'
-import type { MessageType } from '@/services/types'
// 全局使用语言包
dayjs.locale('zh-cn')
// 设置一周起始位周一
dayjs.extend(weekday)
-// 5 分钟 5 * 60 * 1000;
-const intervalTime = 300000
-// 计数上限 20 条，到达 20 重置
-const computedCountMax = 20
-// 计数
-let computedCount = 0
// 时间格式化为相对文本，仿微信风格
-const timeToStr = (time: number) => {
+export const timeToStr = (time: number) => {
const sendTime = dayjs(time)
// 计算今天和消息的发送时间间隔多少天
const gapDay = dayjs().endOf('day').diff(sendTime, 'day')
@@ -30,36 +23,6 @@ const timeToStr = (time: number) => {
: dayjs(sendTime).format('dddd HH:mm')
}
-// 超过5分钟，或者超过20条消息，就添加展示时间
-const checkTimeInterval = (cur: MessageType, pre: MessageType) => {
- // 如果有一个超过 5 分钟了或者计数达到 20 条了
- if ((pre && cur.message.sendTime - pre.message.sendTime > intervalTime) || computedCount >= computedCountMax) {
- // 重置计数
- computedCount = 0
- // 返回时间标记
- return { ...cur, timeBlock: timeToStr(cur.message.sendTime) }
- } else {
- // 时间间隔很短的就累计计数
- computedCount += 1
- return cur
- }
-}
-
-export const computedTimeBlock = (list: MessageType[], needFirst = true) => {
- if (!list || list.length === 0) return []
- // 是否需要保留 传入 list 第一个，如果是接口拉回来的消息列表就要保留，如果接收到新消息，需要拿当前消息列表最后一个拿来做时间间隔计算的话，就不需要保留第一个
- const temp = needFirst ? [list[0]] : []
- // 跳过第一个
- for (let index = 1, len = list.length; index < len; index++) {
- const item = list[index]
- // 上个聊天记录
- const preItem = list[index - 1]
- // 超过20分钟，或者超过50条评论，展示时间
- temp.push(checkTimeInterval(item, preItem))
- }
- return temp
-}
-
/**
* 消息时间戳格式化
* @param timestamp 时间戳
diff --git a/src/utils/ImRequestUtils.ts b/src/utils/ImRequestUtils.ts
index 844ed4d5efba62e6cce2e81d2d1cf8c627a14b4d..8fe83c684907ed880b187e52fb39b0949c306e93 100644
--- a/src/utils/ImRequestUtils.ts
+++ b/src/utils/ImRequestUtils.ts
@@ -129,10 +129,10 @@ export async function getUserDetail() {
/**
* 快捷方法：获取群组详情
*/
-export async function getGroupDetail(groupId: string) {
+export async function getGroupDetail(roomId: string) {
return await imRequest({
url: ImUrlEnum.GROUP_DETAIL,
- params: { id: groupId }
+ params: { id: roomId }
})
}
@@ -215,10 +215,10 @@ export async function getBadgesBatch(body: CacheBadgeReq[]) {
})
}
-export async function getMsgList(params: any) {
+export async function getMsgList(body: { msgIds?: string[]; lastOptTime?: number }) {
return await imRequest({
url: ImUrlEnum.GET_MSG_LIST,
- params
+ body
})
}
@@ -318,6 +318,13 @@ export async function sendAddFriendRequest(body: { targetUid: string; msg: strin
})
}
+export async function requestNoticePage(params: { pageSize: number; pageNo: number; cursor: string }) {
+ return await imRequest({
+ url: ImUrlEnum.REQUEST_NOTICE_PAGE,
+ params
+ })
+}
+
export async function handleInvite(body: { applyId: string; state: number }) {
return await imRequest({
url: ImUrlEnum.HANDLE_INVITE,
@@ -542,3 +549,17 @@ export async function forgetPassword(body: {
body
})
}
+
+export async function mergeMsg(body: { fromRoomId: string; type: number; roomIds: string[]; messageIds: string[] }) {
+ return await imRequest({
+ url: ImUrlEnum.MERGE_MSG,
+ body
+ })
+}
+
+export async function getUserByIds(body: { uidList: string[] }) {
+ return await imRequest({
+ url: ImUrlEnum.GET_USER_BY_IDS,
+ body
+ })
+}
diff --git a/src/utils/MessageReply.ts b/src/utils/MessageReply.ts
index efc53918a261dec7d94f0c3d3c4062ae2c6238f5..281ab17067b1fdabf4422fbacb3562b25e64656f 100644
--- a/src/utils/MessageReply.ts
+++ b/src/utils/MessageReply.ts
@@ -58,8 +58,8 @@ export const getReplyContent = (message: MsgType): string => {
}
case MsgEnum.MERGE: {
- // 合并消息
- content = '[合并消息]'
+ // 聊天记录
+ content = '[聊天记录]'
break
}
diff --git a/src/views/friendWindow/AddFriendVerify.vue b/src/views/friendWindow/AddFriendVerify.vue
index 0fc1268e1ff37f11cd998dcb98104e2cda9a79b2..690579f97f31e4e20189cea09dd3668973365727 100644
--- a/src/views/friendWindow/AddFriendVerify.vue
+++ b/src/views/friendWindow/AddFriendVerify.vue
@@ -8,11 +8,7 @@
:current-label="WebviewWindow.getCurrent().label" />
-
- 申请加好友 -
+申请加好友
diff --git a/src/views/loginWindow/Network.vue b/src/views/loginWindow/Network.vue
index 20a71f0bae75b5c71ffdd3d45155e0512db94d89..a6c301edff79d5fa68fa2ed2d8d5ab00b2126a3b 100644
--- a/src/views/loginWindow/Network.vue
+++ b/src/views/loginWindow/Network.vue
@@ -107,6 +107,8 @@
diff --git a/src/views/moreWindow/settings/config.ts b/src/views/moreWindow/settings/config.ts
index 6fe5e9130d98b4b0ec6ab16d6e4b28e91534f5b5..0d4b32367852a085273bbc50eb9b5ee5f278469e 100644
--- a/src/views/moreWindow/settings/config.ts
+++ b/src/views/moreWindow/settings/config.ts
@@ -12,15 +12,20 @@ const sideOptions = ref([
icon: 'setting-config'
},
{
- url: '/manageStore',
- label: '存储管理',
- icon: 'mini-sd-card'
+ url: '/notification',
+ label: '消息通知',
+ icon: 'remind'
},
{
url: '/shortcut',
label: '快捷键管理',
icon: 'enter-the-keyboard'
},
+ {
+ url: '/manageStore',
+ label: '存储管理',
+ icon: 'mini-sd-card'
+ },
{
url: '/loginSetting',
label: '登录设置',
diff --git a/src/views/multiMsgWindow/index.vue b/src/views/multiMsgWindow/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4f47ff6603b493271d170b725d365925c5fe44c1
--- /dev/null
+++ b/src/views/multiMsgWindow/index.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tsconfig.node.json b/tsconfig.node.json
index c900d5f4b7923fb9b329156f0e94ef00b578c731..be9453c2eaa5ab0d6b45f43f161b63c13127a367 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -1,5 +1,6 @@
{
"compilerOptions": {
+ "target": "ES2022",
"composite": true,
"skipLibCheck": true,
"module": "ESNext",
diff --git a/vite.config.ts b/vite.config.ts
index 7163b322c89ec2fec7d2f464bdd9669cb7f86c38..e72dff02ef0340c833fbb315c89f05757120bbb1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,6 +4,7 @@ import terser from '@rollup/plugin-terser'
import UnoCSS from '@unocss/vite'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
+import { internalIpV4 } from 'internal-ip'
import postcsspxtorem from 'postcss-pxtorem'
import AutoImport from 'unplugin-auto-import/vite' //自动导入
import { NaiveUiResolver, VantResolver } from 'unplugin-vue-components/resolvers'
@@ -16,12 +17,35 @@ import { getRootPath, getSrcPath } from './build/config/getPath'
const packageJson = JSON.parse(readFileSync(join(process.cwd(), 'package.json'), 'utf-8'))
const dependencies = Object.keys(packageJson.dependencies || {})
+// 预先获取本地IP
+const rawIP = await internalIpV4()
+
// https://vitejs.dev/config/
/**! 不需要优化前端打包(如开启gzip) */
export default defineConfig(({ mode }: ConfigEnv) => {
// 获取当前环境的配置,如何设置第三个参数则加载所有变量，而不是以"VITE_"前缀的变量
const config = loadEnv(mode, process.cwd(), '')
- const host = config.TAURI_DEV_HOST
+ const isPC =
+ config.TAURI_ENV_PLATFORM === 'windows' ||
+ config.TAURI_ENV_PLATFORM === 'darwin' ||
+ config.TAURI_ENV_PLATFORM === 'linux'
+
+ // 根据平台决定host地址
+ const host = (() => {
+ if (isPC) {
+ return '127.0.0.1'
+ }
+
+ // 移动端逻辑：检查是否为有效的内网IP地址
+ if (rawIP && !rawIP.endsWith('.0') && !rawIP.endsWith('.255')) {
+ return rawIP // 有效IP且非网段/广播地址
+ }
+
+ // 无效IP或特殊地址的情况
+ return config.TAURI_ENV_PLATFORM === 'android' ? '0.0.0.0' : '127.0.0.1'
+ })()
+
+ console.log('Host:', host)
return {
resolve: {
@@ -90,11 +114,18 @@ export default defineConfig(({ mode }: ConfigEnv) => {
})
],
build: {
- target: ['chrome87', 'edge88', 'firefox78', 'safari14'], // 兼容低版本浏览器
+ // 设置兼容低版本浏览器的目标
+ target: ['chrome87', 'edge88', 'firefox78', 'safari14'],
cssCodeSplit: true, // 启用 CSS 代码拆分
minify: 'terser', // 指定使用哪种混淆器
// chunk 大小警告的限制(kb)
chunkSizeWarningLimit: 1200,
+ // esbuild配置，解决低版本浏览器兼容性问题
+ esbuild: {
+ supported: {
+ 'top-level-await': false
+ }
+ },
// 分包配置
rollupOptions: {
output: {
@@ -123,15 +154,6 @@ export default defineConfig(({ mode }: ConfigEnv) => {
clearScreen: false,
// 2. tauri expects a fixed port, fail if that port is not available
server: {
- //配置跨域
- proxy: {
- '/api': {
- // “/api” 以及前置字符串会被替换为真正域名
- target: config.VITE_SERVICE_URL, // 请求域名
- changeOrigin: true, // 是否跨域
- rewrite: (path) => path.replace(/^\/api/, '')
- }
- },
hmr: {
protocol: 'ws',
host: host,
+
+
+
+
+
+
+
+
+
+
+ {{ getUserDisplayName(item.fromUser.uid) }}
+{{ formatTime(item.message.sendTime) }}
+
+
+