YiLin/phone-app------test1-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

好友，群聊分页加载

Browse Source
This commit is contained in:
YiLin
2026-08-05 14:51:15 +08:00
parent e0d7f93c80
commit fb421cd021
4 changed files with 426 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
unpackage/dist/dev/app-plus/app-service.js vendored
View File

@@ -5005,7 +5005,7 @@ This will fail in production.`);
});
});
};
const getFriendMessages = async (sessionId, current = 1) => {
const getFriendMessages = async (sessionId, size, current = 1) => {
formatAppLog("log", "at utils/friend-api.js:88", "请求的好友消息id：", sessionId);
return new Promise((resolve, reject) => {
uni.request({
@@ -5013,7 +5013,7 @@ This will fail in production.`);
method: "POST",
data: {
"sessionId": sessionId,
"size": 100,
"size": size,
"current": current,
"beginTime": "",
"endTime": ""
@@ -5044,7 +5044,7 @@ This will fail in production.`);
});
});
};
const getGroupMessages = async (groupId, current = 1) => {
const getGroupMessages = async (groupId, size, current = 1) => {
formatAppLog("log", "at utils/friend-api.js:134", "请求的群聊消息id：", groupId);
return new Promise((resolve, reject) => {
uni.request({
@@ -5052,7 +5052,7 @@ This will fail in production.`);
method: "POST",
data: {
"current": current,
"size": 100,
"size": size,
"groupId": groupId,
"beginTime": "",
"endTime": ""
@@ -5758,7 +5758,8 @@ This will fail in production.`);
}
});
}
const pageSize = 200;
const pageSize$1 = 200;
const groupSize = 100;
const _sfc_main$a = {
__name: "Chat",
setup(__props, { expose: __expose }) {
@@ -6836,6 +6837,12 @@ This will fail in production.`);
const aiPageNumber = vue.ref(0);
const hasMoreAIMessages = vue.ref(true);
const currentPage = vue.ref(1);
const isFriendLoadingMore = vue.ref(false);
const friendPageNumber = vue.ref(1);
const hasMoreFriendMessages = vue.ref(true);
const isGroupLoadingMore = vue.ref(false);
const groupPageNumber = vue.ref(1);
const hasMoreGroupMessages = vue.ref(true);
const currentMessages = vue.computed(() => {
return allmessages.value;
});
@@ -6843,9 +6850,9 @@ This will fail in production.`);
try {
aiPageNumber.value = 0;
hasMoreAIMessages.value = true;
const rawMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize, 0) || [];
const rawMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize$1, 0) || [];
allmessages.value = rawMessages;
formatAppLog("log", "at pages/Chat/Chat.vue:1712", "获取到的所有消息：", JSON.stringify(allmessages.value));
formatAppLog("log", "at pages/Chat/Chat.vue:1723", "获取到的所有消息：", JSON.stringify(allmessages.value));
scrollToBottom();
} catch (error) {
uni.showToast({
@@ -6858,7 +6865,10 @@ This will fail in production.`);
};
const takeFriendMessages = async () => {
try {
allmessages.value = await getFriendMessages(currentSessionId.value) || [];
friendPageNumber.value = 1;
hasMoreFriendMessages.value = true;
const rawMessages = await getFriendMessages(currentSessionId.value, pageSize$1, 0) || [];
allmessages.value = rawMessages;
scrollToBottom();
} catch (error) {
uni.showToast({
@@ -6871,13 +6881,16 @@ This will fail in production.`);
};
const takeGroupMessages = async () => {
try {
allmessages.value = await getGroupMessages(currentSessionId.value) || [];
formatAppLog("log", "at pages/Chat/Chat.vue:1744", "群聊消息：", allmessages.value);
groupPageNumber.value = 1;
hasMoreGroupMessages.value = true;
const rawMessages = await getGroupMessages(currentSessionId.value, pageSize$1, 0) || [];
allmessages.value = rawMessages;
formatAppLog("log", "at pages/Chat/Chat.vue:1761", "群聊消息：", allmessages.value);
const memberList = await getGroupMemberList(currentSessionId.value);
formatAppLog("log", "at pages/Chat/Chat.vue:1747", "获取到的群成员列表：", memberList);
formatAppLog("log", "at pages/Chat/Chat.vue:1764", "获取到的群成员列表：", memberList);
if (memberList && memberList.length) {
groupMemberList.value = await takeGroupMemberAvatar(memberList);
formatAppLog("log", "at pages/Chat/Chat.vue:1750", "群成员列表（带头像）：", groupMemberList.value);
formatAppLog("log", "at pages/Chat/Chat.vue:1767", "群成员列表（带头像）：", groupMemberList.value);
} else {
groupMemberList.value = [];
}
@@ -6894,6 +6907,10 @@ This will fail in production.`);
const onScrollToUpper = async () => {
if (ChatType.value === 0) {
await loadMoreAIMessages();
} else if (ChatType.value === 1) {
await loadMoreFriendMessages();
} else if (ChatType.value === 2) {
await loadMoreGroupMessages();
}
};
const loadMoreAIMessages = async () => {
@@ -6902,7 +6919,7 @@ This will fail in production.`);
isAILoadingMore.value = true;
try {
const nextPage = aiPageNumber.value + 1;
const olderMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize, nextPage);
const olderMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize$1, nextPage);
if (olderMessages && olderMessages.length > 0) {
aiPageNumber.value = nextPage;
allmessages.value = [...olderMessages, ...allmessages.value];
@@ -6912,12 +6929,56 @@ This will fail in production.`);
hasMoreAIMessages.value = false;
}
} catch (e2) {
formatAppLog("error", "at pages/Chat/Chat.vue:1808", "加载更多消息失败:", e2);
formatAppLog("error", "at pages/Chat/Chat.vue:1829", "加载更多消息失败:", e2);
uni.showToast({ title: "加载更多失败", icon: "none" });
} finally {
isAILoadingMore.value = false;
}
};
const loadMoreFriendMessages = async () => {
if (isFriendLoadingMore.value || !hasMoreFriendMessages.value || !currentSessionId.value)
return;
isFriendLoadingMore.value = true;
try {
const nextPage = friendPageNumber.value + 1;
const olderMessages = await getFriendMessages(currentSessionId.value, pageSize$1, nextPage);
if (olderMessages && olderMessages.length > 0) {
friendPageNumber.value = nextPage;
allmessages.value = [...olderMessages, ...allmessages.value];
await vue.nextTick();
scrollToView.value = "msg-" + olderMessages.length;
} else {
hasMoreFriendMessages.value = false;
}
} catch (e2) {
formatAppLog("error", "at pages/Chat/Chat.vue:1854", "加载更多好友消息失败:", e2);
uni.showToast({ title: "加载更多失败", icon: "none" });
} finally {
isFriendLoadingMore.value = false;
}
};
const loadMoreGroupMessages = async () => {
if (isGroupLoadingMore.value || !hasMoreGroupMessages.value || !currentSessionId.value)
return;
isGroupLoadingMore.value = true;
try {
const nextPage = groupPageNumber.value + 1;
const olderMessages = await getGroupMessages(currentSessionId.value, pageSize$1, nextPage);
if (olderMessages && olderMessages.length > 0) {
groupPageNumber.value = nextPage;
allmessages.value = [...olderMessages, ...allmessages.value];
await vue.nextTick();
scrollToView.value = "msg-" + olderMessages.length;
} else {
hasMoreGroupMessages.value = false;
}
} catch (e2) {
formatAppLog("error", "at pages/Chat/Chat.vue:1879", "加载更多群聊消息失败:", e2);
uni.showToast({ title: "加载更多失败", icon: "none" });
} finally {
isGroupLoadingMore.value = false;
}
};
const onScroll = (e2) => {
};
const scrollToBottom = async () => {
@@ -6928,9 +6989,9 @@ This will fail in production.`);
}
};
vue.watch(() => friendSocketStore.MessageReceived, (newId) => {
formatAppLog("log", "at pages/Chat/Chat.vue:1829", "收到了好友消息");
formatAppLog("log", "at pages/Chat/Chat.vue:1900", "收到了好友消息");
if (newId) {
formatAppLog("log", "at pages/Chat/Chat.vue:1831", "ChatType:", ChatType.value);
formatAppLog("log", "at pages/Chat/Chat.vue:1902", "ChatType:", ChatType.value);
switch (ChatType.value) {
case 0:
takeConversationMessages();
@@ -6945,7 +7006,7 @@ This will fail in production.`);
friendSocketStore.MessageReceived = false;
break;
default:
formatAppLog("log", "at pages/Chat/Chat.vue:1847", "default 分支");
formatAppLog("log", "at pages/Chat/Chat.vue:1918", "default 分支");
friendSocketStore.MessageReceived = false;
break;
}
@@ -7028,7 +7089,7 @@ This will fail in production.`);
return downloadToastTimer;
}, set downloadToastTimer(v) {
downloadToastTimer = v;
}, showDownloadToast, hideDownloadToast, openLink, downloadAndHandle, sendMessage, sendFriendMessage, sendGroupMessage, sendAIMessage, stopConversation, textMessage, UserConversations, currentSessionId, userToken, UserId, UserAvatar, UserData, takeUserInfo, takeUserConversations, FriendInfoList, takeFriendList, takeTalkUserAvatar, takeUserAvatar, GroupList, takeGroupList, groupMemberList, takeGroupMemberAvatar, getGroupMemberAvatarById, allmessages, scrollToView, bottomToggle, isLoadingMore, isAILoadingMore, aiPageNumber, hasMoreAIMessages, currentPage, pageSize, currentMessages, takeConversationMessages, takeFriendMessages, takeGroupMessages, onScrollToUpper, loadMoreAIMessages, onScroll, scrollToBottom, computed: vue.computed, getCurrentInstance: vue.getCurrentInstance, nextTick: vue.nextTick, onMounted: vue.onMounted, ref: vue.ref, watch: vue.watch, get onLoad() {
}, showDownloadToast, hideDownloadToast, openLink, downloadAndHandle, sendMessage, sendFriendMessage, sendGroupMessage, sendAIMessage, stopConversation, textMessage, UserConversations, currentSessionId, userToken, UserId, UserAvatar, UserData, takeUserInfo, takeUserConversations, FriendInfoList, takeFriendList, takeTalkUserAvatar, takeUserAvatar, GroupList, takeGroupList, groupMemberList, takeGroupMemberAvatar, getGroupMemberAvatarById, allmessages, scrollToView, bottomToggle, isLoadingMore, isAILoadingMore, aiPageNumber, hasMoreAIMessages, currentPage, pageSize: pageSize$1, isFriendLoadingMore, friendPageNumber, hasMoreFriendMessages, isGroupLoadingMore, groupPageNumber, hasMoreGroupMessages, groupSize, currentMessages, takeConversationMessages, takeFriendMessages, takeGroupMessages, onScrollToUpper, loadMoreAIMessages, loadMoreFriendMessages, loadMoreGroupMessages, onScroll, scrollToBottom, computed: vue.computed, getCurrentInstance: vue.getCurrentInstance, nextTick: vue.nextTick, onMounted: vue.onMounted, ref: vue.ref, watch: vue.watch, get onLoad() {
return onLoad;
}, get onShow() {
return onShow;
@@ -7360,7 +7421,7 @@ This will fail in production.`);
onScroll: $setup.onScroll,
onScrolltoupper: $setup.onScrollToUpper
}, [
$setup.ChatType === 0 && $setup.isAILoadingMore ? (vue.openBlock(), vue.createElementBlock("view", {
$setup.ChatType === 0 && $setup.isAILoadingMore || $setup.ChatType === 1 && $setup.isFriendLoadingMore || $setup.ChatType === 2 && $setup.isGroupLoadingMore ? (vue.openBlock(), vue.createElementBlock("view", {
key: 0,
class: "load-more-tip"
}, [
@@ -13749,6 +13810,7 @@ This will fail in production.`);
]);
}
const PagesCloudDbDetailCloudDbDetail = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$3], ["__scopeId", "data-v-96fa4671"], ["__file", "D:/Projects/uniapp/app-test/test1/pages/CloudDbDetail/CloudDbDetail.vue"]]);
const pageSize = 200;
const _sfc_main$3 = {
__name: "text",
setup(__props, { expose: __expose }) {
@@ -13758,7 +13820,7 @@ This will fail in production.`);
if (friendSocketStore.isConnected)
return;
if (!userToken.value || !UserId.value) {
formatAppLog("warn", "at pages/text/text.vue:335", "Token或UserId未准备好");
formatAppLog("warn", "at pages/text/text.vue:339", "Token或UserId未准备好");
return;
}
friendSocketStore.connect({
@@ -13841,7 +13903,7 @@ This will fail in production.`);
);
return html;
} catch (e2) {
formatAppLog("error", "at pages/text/text.vue:456", "解析失败", e2);
formatAppLog("error", "at pages/text/text.vue:460", "解析失败", e2);
return content;
}
};
@@ -13892,7 +13954,7 @@ This will fail in production.`);
files
};
} catch (e2) {
formatAppLog("error", "at pages/text/text.vue:525", "解析文件信息失败:", e2);
formatAppLog("error", "at pages/text/text.vue:529", "解析文件信息失败:", e2);
return {
textContent: content,
files: []
@@ -13929,7 +13991,7 @@ This will fail in production.`);
}
takeUserConversations();
} catch (error) {
formatAppLog("error", "at pages/text/text.vue:570", "新建普通会话失败：", error);
formatAppLog("error", "at pages/text/text.vue:574", "新建普通会话失败：", error);
uni.showToast({
title: "创建会话失败，请重试",
icon: "none"
@@ -13967,7 +14029,7 @@ This will fail in production.`);
};
const previewFileArray = vue.ref([]);
const uploadPhoto = () => {
formatAppLog("log", "at pages/text/text.vue:619", "点击了拍照上传");
formatAppLog("log", "at pages/text/text.vue:623", "点击了拍照上传");
uni.chooseImage({
count: 1,
sourceType: ["camera", "album"],
@@ -13990,7 +14052,7 @@ This will fail in production.`);
});
},
fail: (err) => {
formatAppLog("error", "at pages/text/text.vue:637", "选择图片失败", err);
formatAppLog("error", "at pages/text/text.vue:641", "选择图片失败", err);
}
});
};
@@ -13999,12 +14061,12 @@ This will fail in production.`);
};
const fileList = vue.ref([]);
const uploadFile = () => {
formatAppLog("log", "at pages/text/text.vue:648", "点击了上传文件");
formatAppLog("log", "at pages/text/text.vue:652", "点击了上传文件");
chooseFile({
count: 5,
type: "all",
success: (res) => {
formatAppLog("log", "at pages/text/text.vue:653", "成功了");
formatAppLog("log", "at pages/text/text.vue:657", "成功了");
fileList.value = res.tempFiles;
previewFileArray.value.push(...res.tempFiles);
uni.showToast({
@@ -14013,7 +14075,7 @@ This will fail in production.`);
});
},
fail: (err) => {
formatAppLog("error", "at pages/text/text.vue:664", "选择失败:", err);
formatAppLog("error", "at pages/text/text.vue:668", "选择失败:", err);
uni.showToast({
title: "选择失败",
icon: "error"
@@ -14213,7 +14275,7 @@ This will fail in production.`);
previewFileArray.value = [];
} catch (err) {
uni.hideLoading();
formatAppLog("error", "at pages/text/text.vue:888", "文件上传失败:", err);
formatAppLog("error", "at pages/text/text.vue:892", "文件上传失败:", err);
uni.showToast({
title: "文件上传失败，请重试",
icon: "error"
@@ -14347,15 +14409,15 @@ This will fail in production.`);
}
};
const stopConversation = async () => {
formatAppLog("log", "at pages/text/text.vue:1057", "中断对话 - 当前会话ID:", currentSessionId.value);
formatAppLog("log", "at pages/text/text.vue:1061", "中断对话 - 当前会话ID:", currentSessionId.value);
try {
await socketStore.send({
type: "stop",
conversation_id: currentSessionId.value
});
formatAppLog("log", "at pages/text/text.vue:1063", "中断指令已发送成功");
formatAppLog("log", "at pages/text/text.vue:1067", "中断指令已发送成功");
} catch (err) {
formatAppLog("error", "at pages/text/text.vue:1065", "中断指令发送失败:", err);
formatAppLog("error", "at pages/text/text.vue:1069", "中断指令发送失败:", err);
}
if (streamingMessageId.value) {
allmessages.value = allmessages.value.filter((m) => m._id !== streamingMessageId.value);
@@ -14373,9 +14435,9 @@ This will fail in production.`);
});
};
vue.watch(() => socketStore.isThinking, (newVal, oldVal) => {
formatAppLog("log", "at pages/text/text.vue:1089", "isThinking 变化:", oldVal, "→", newVal, "messageString:", socketStore.messageString);
formatAppLog("log", "at pages/text/text.vue:1093", "isThinking 变化:", oldVal, "→", newVal, "messageString:", socketStore.messageString);
if (!oldVal && newVal) {
formatAppLog("log", "at pages/text/text.vue:1092", "AI开始回复（跨设备同步），锁定输入框");
formatAppLog("log", "at pages/text/text.vue:1096", "AI开始回复（跨设备同步），锁定输入框");
isThinking.value = true;
if (!streamingMessageId.value) {
streamingMessageId.value = "streaming-" + Date.now();
@@ -14389,7 +14451,7 @@ This will fail in production.`);
return;
}
if (oldVal && !newVal) {
formatAppLog("log", "at pages/text/text.vue:1108", "AI回复结束（正常/中断），解锁并刷新消息列表");
formatAppLog("log", "at pages/text/text.vue:1112", "AI回复结束（正常/中断），解锁并刷新消息列表");
if (streamingMessageId.value) {
allmessages.value = allmessages.value.filter((m) => m._id !== streamingMessageId.value);
streamingMessageId.value = null;
@@ -14443,15 +14505,15 @@ This will fail in production.`);
UserData.value = await getUserInfo(userToken.value);
UserId.value = UserData.value._id;
UserAvatar.value = UserData.value.avatar || "";
formatAppLog("log", "at pages/text/text.vue:1174", "用户信息已加载:", UserId.value, UserAvatar.value);
formatAppLog("log", "at pages/text/text.vue:1178", "用户信息已加载:", UserId.value, UserAvatar.value);
} catch (error) {
formatAppLog("error", "at pages/text/text.vue:1176", "获取用户信息失败:", error);
formatAppLog("error", "at pages/text/text.vue:1180", "获取用户信息失败:", error);
}
};
const takeUserConversations = async () => {
try {
userToken.value = getToken();
formatAppLog("log", "at pages/text/text.vue:1184", "token:", userToken.value);
formatAppLog("log", "at pages/text/text.vue:1188", "token:", userToken.value);
UserConversations.value = await getUserConversations(userToken.value) || [];
const savedSessionId = getCurrentSessionId();
if (savedSessionId && UserConversations.value.some((c) => c._id === savedSessionId)) {
@@ -14461,7 +14523,7 @@ This will fail in production.`);
} else {
currentSessionId.value = "";
}
formatAppLog("log", "at pages/text/text.vue:1196", "保存会话id：", currentSessionId.value);
formatAppLog("log", "at pages/text/text.vue:1200", "保存会话id：", currentSessionId.value);
uni.setStorageSync("currentSessionId", currentSessionId.value);
} catch (error) {
uni.showToast({
@@ -14473,17 +14535,17 @@ This will fail in production.`);
const FriendInfoList = vue.ref([]);
const takeFriendList = async () => {
try {
formatAppLog("log", "at pages/text/text.vue:1211", "开始获取好友列表");
formatAppLog("log", "at pages/text/text.vue:1215", "开始获取好友列表");
const friendList = await getChatFriend(UserId.value);
formatAppLog("log", "at pages/text/text.vue:1214", "friendList:", friendList);
formatAppLog("log", "at pages/text/text.vue:1218", "friendList:", friendList);
if (friendList && friendList.length) {
FriendInfoList.value = await takeUserAvatar(friendList);
} else {
FriendInfoList.value = [];
formatAppLog("log", "at pages/text/text.vue:1219", "好友列表为空");
formatAppLog("log", "at pages/text/text.vue:1223", "好友列表为空");
}
} catch (error) {
formatAppLog("error", "at pages/text/text.vue:1222", "获取好友列表失败:", error);
formatAppLog("error", "at pages/text/text.vue:1226", "获取好友列表失败:", error);
FriendInfoList.value = [];
} finally {
UserConversations.value = FriendInfoList.value;
@@ -14510,17 +14572,17 @@ This will fail in production.`);
};
});
} catch (err) {
formatAppLog("error", "at pages/text/text.vue:1252", "获取好友头像失败", err);
formatAppLog("error", "at pages/text/text.vue:1256", "获取好友头像失败", err);
return friendList;
}
};
const GroupList = vue.ref([]);
const takeGroupList = async () => {
try {
formatAppLog("log", "at pages/text/text.vue:1262", "开始获取群聊列表");
formatAppLog("log", "at pages/text/text.vue:1266", "开始获取群聊列表");
GroupList.value = await getGroup(UserId.value);
} catch (error) {
formatAppLog("error", "at pages/text/text.vue:1267", "获取群聊列表失败:", error);
formatAppLog("error", "at pages/text/text.vue:1271", "获取群聊列表失败:", error);
GroupList.value = [];
} finally {
UserConversations.value = GroupList.value;
@@ -14532,22 +14594,22 @@ This will fail in production.`);
return [];
try {
const memberIds = memberList.map((item) => item.groupContactId);
formatAppLog("log", "at pages/text/text.vue:1281", "请求头像的ID列表:", memberIds);
formatAppLog("log", "at pages/text/text.vue:1285", "请求头像的ID列表:", memberIds);
const memberAvatarList = await getUserAvatar(userToken.value, memberIds);
formatAppLog("log", "at pages/text/text.vue:1283", "头像接口返回数据:", memberAvatarList);
formatAppLog("log", "at pages/text/text.vue:1287", "头像接口返回数据:", memberAvatarList);
const userMap = new Map(memberAvatarList.map((user) => [user.user_id, user]) || []);
formatAppLog("log", "at pages/text/text.vue:1286", "userMap的keys:", Array.from(userMap.keys()));
formatAppLog("log", "at pages/text/text.vue:1290", "userMap的keys:", Array.from(userMap.keys()));
return memberList.map((member) => {
const memberId = member.groupContactId;
const userInfo = userMap.get(memberId);
formatAppLog("log", "at pages/text/text.vue:1291", `查找 ${memberId} 的头像:`, userInfo);
formatAppLog("log", "at pages/text/text.vue:1295", `查找 ${memberId} 的头像:`, userInfo);
return {
...member,
avatar: (userInfo == null ? void 0 : userInfo.avatar) || null
};
});
} catch (err) {
formatAppLog("error", "at pages/text/text.vue:1298", "获取群成员头像失败", err);
formatAppLog("error", "at pages/text/text.vue:1302", "获取群成员头像失败", err);
return memberList;
}
};
@@ -14562,12 +14624,24 @@ This will fail in production.`);
const bottomToggle = vue.ref(false);
const isLoadingMore = vue.ref(false);
const currentPage = vue.ref(1);
const isAILoadingMore = vue.ref(false);
const aiPageNumber = vue.ref(0);
const hasMoreAIMessages = vue.ref(true);
const isFriendLoadingMore = vue.ref(false);
const friendPageNumber = vue.ref(1);
const hasMoreFriendMessages = vue.ref(true);
const isGroupLoadingMore = vue.ref(false);
const groupPageNumber = vue.ref(1);
const hasMoreGroupMessages = vue.ref(true);
const currentMessages = vue.computed(() => {
return allmessages.value;
});
const takeConversationMessages = async () => {
try {
allmessages.value = await getConversationMessages(userToken.value, currentSessionId.value) || [];
aiPageNumber.value = 0;
hasMoreAIMessages.value = true;
const rawMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize, 0) || [];
allmessages.value = rawMessages;
scrollToBottom();
} catch (error) {
uni.showToast({
@@ -14578,7 +14652,10 @@ This will fail in production.`);
};
const takeFriendMessages = async () => {
try {
allmessages.value = await getFriendMessages(currentSessionId.value) || [];
friendPageNumber.value = 1;
hasMoreFriendMessages.value = true;
const rawMessages = await getFriendMessages(currentSessionId.value, 1) || [];
allmessages.value = rawMessages;
scrollToBottom();
} catch (error) {
uni.showToast({
@@ -14589,13 +14666,16 @@ This will fail in production.`);
};
const takeGroupMessages = async () => {
try {
allmessages.value = await getGroupMessages(currentSessionId.value) || [];
formatAppLog("log", "at pages/text/text.vue:1358", "群聊消息：", allmessages.value);
groupPageNumber.value = 1;
hasMoreGroupMessages.value = true;
const rawMessages = await getGroupMessages(currentSessionId.value, 1) || [];
allmessages.value = rawMessages;
formatAppLog("log", "at pages/text/text.vue:1386", "群聊消息：", allmessages.value);
const memberList = await getGroupMemberList(currentSessionId.value);
formatAppLog("log", "at pages/text/text.vue:1361", "获取到的群成员列表：", memberList);
formatAppLog("log", "at pages/text/text.vue:1389", "获取到的群成员列表：", memberList);
if (memberList && memberList.length) {
groupMemberList.value = await takeGroupMemberAvatar(memberList);
formatAppLog("log", "at pages/text/text.vue:1364", "群成员列表（带头像）：", groupMemberList.value);
formatAppLog("log", "at pages/text/text.vue:1392", "群成员列表（带头像）：", groupMemberList.value);
} else {
groupMemberList.value = [];
}
@@ -14609,6 +14689,81 @@ This will fail in production.`);
};
const onScroll = (e2) => {
};
const onScrollToUpper = async () => {
if (ChatType.value === 0) {
await loadMoreAIMessages();
} else if (ChatType.value === 1) {
await loadMoreFriendMessages();
} else if (ChatType.value === 2) {
await loadMoreGroupMessages();
}
};
const loadMoreAIMessages = async () => {
if (isAILoadingMore.value || !hasMoreAIMessages.value || !currentSessionId.value)
return;
isAILoadingMore.value = true;
try {
const nextPage = aiPageNumber.value + 1;
const olderMessages = await getConversationMessages(userToken.value, currentSessionId.value, pageSize, nextPage);
if (olderMessages && olderMessages.length > 0) {
aiPageNumber.value = nextPage;
allmessages.value = [...olderMessages, ...allmessages.value];
await vue.nextTick();
scrollToView.value = "msg-" + olderMessages.length;
} else {
hasMoreAIMessages.value = false;
}
} catch (e2) {
formatAppLog("error", "at pages/text/text.vue:1454", "加载更多AI消息失败:", e2);
uni.showToast({ title: "加载更多失败", icon: "none" });
} finally {
isAILoadingMore.value = false;
}
};
const loadMoreFriendMessages = async () => {
if (isFriendLoadingMore.value || !hasMoreFriendMessages.value || !currentSessionId.value)
return;
isFriendLoadingMore.value = true;
try {
const nextPage = friendPageNumber.value + 1;
const olderMessages = await getFriendMessages(currentSessionId.value, nextPage);
if (olderMessages && olderMessages.length > 0) {
friendPageNumber.value = nextPage;
allmessages.value = [...olderMessages, ...allmessages.value];
await vue.nextTick();
scrollToView.value = "msg-" + olderMessages.length;
} else {
hasMoreFriendMessages.value = false;
}
} catch (e2) {
formatAppLog("error", "at pages/text/text.vue:1478", "加载更多好友消息失败:", e2);
uni.showToast({ title: "加载更多失败", icon: "none" });
} finally {
isFriendLoadingMore.value = false;
}
};
const loadMoreGroupMessages = async () => {
if (isGroupLoadingMore.value || !hasMoreGroupMessages.value || !currentSessionId.value)
return;
isGroupLoadingMore.value = true;
try {
const nextPage = groupPageNumber.value + 1;
const olderMessages = await getGroupMessages(currentSessionId.value, nextPage);
if (olderMessages && olderMessages.length > 0) {
groupPageNumber.value = nextPage;
allmessages.value = [...olderMessages, ...allmessages.value];
await vue.nextTick();
scrollToView.value = "msg-" + olderMessages.length;
} else {
hasMoreGroupMessages.value = false;
}
} catch (e2) {
formatAppLog("error", "at pages/text/text.vue:1502", "加载更多群聊消息失败:", e2);
uni.showToast({ title: "加载更多失败", icon: "none" });
} finally {
isGroupLoadingMore.value = false;
}
};
const scrollToBottom = async () => {
await vue.nextTick();
if (currentMessages.value.length > 0) {
@@ -14617,9 +14772,9 @@ This will fail in production.`);
}
};
vue.watch(() => friendSocketStore.MessageReceived, (newId) => {
formatAppLog("log", "at pages/text/text.vue:1409", "收到了好友消息");
formatAppLog("log", "at pages/text/text.vue:1521", "收到了好友消息");
if (newId) {
formatAppLog("log", "at pages/text/text.vue:1411", "ChatType:", ChatType.value);
formatAppLog("log", "at pages/text/text.vue:1523", "ChatType:", ChatType.value);
switch (ChatType.value) {
case 0:
takeConversationMessages();
@@ -14634,7 +14789,7 @@ This will fail in production.`);
friendSocketStore.MessageReceived = false;
break;
default:
formatAppLog("log", "at pages/text/text.vue:1427", "default 分支");
formatAppLog("log", "at pages/text/text.vue:1539", "default 分支");
friendSocketStore.MessageReceived = false;
break;
}
@@ -14700,7 +14855,7 @@ This will fail in production.`);
return downloadToastTimer;
}, set downloadToastTimer(v) {
downloadToastTimer = v;
}, showDownloadToast, hideDownloadToast, openLink, downloadAndHandle, sendMessage, sendFriendMessage, sendGroupMessage, sendAIMessage, stopConversation, textMessage, UserConversations, currentSessionId, userToken, UserId, UserAvatar, UserData, takeUserInfo, takeUserConversations, FriendInfoList, takeFriendList, takeTalkUserAvatar, takeUserAvatar, GroupList, takeGroupList, groupMemberList, takeGroupMemberAvatar, getGroupMemberAvatarById, allmessages, scrollToView, bottomToggle, isLoadingMore, currentPage, currentMessages, takeConversationMessages, takeFriendMessages, takeGroupMessages, onScroll, scrollToBottom, computed: vue.computed, getCurrentInstance: vue.getCurrentInstance, nextTick: vue.nextTick, onMounted: vue.onMounted, ref: vue.ref, watch: vue.watch, get onShow() {
}, showDownloadToast, hideDownloadToast, openLink, downloadAndHandle, sendMessage, sendFriendMessage, sendGroupMessage, sendAIMessage, stopConversation, textMessage, UserConversations, currentSessionId, userToken, UserId, UserAvatar, UserData, takeUserInfo, takeUserConversations, FriendInfoList, takeFriendList, takeTalkUserAvatar, takeUserAvatar, GroupList, takeGroupList, groupMemberList, takeGroupMemberAvatar, getGroupMemberAvatarById, allmessages, scrollToView, bottomToggle, isLoadingMore, currentPage, pageSize, isAILoadingMore, aiPageNumber, hasMoreAIMessages, isFriendLoadingMore, friendPageNumber, hasMoreFriendMessages, isGroupLoadingMore, groupPageNumber, hasMoreGroupMessages, currentMessages, takeConversationMessages, takeFriendMessages, takeGroupMessages, onScroll, onScrollToUpper, loadMoreAIMessages, loadMoreFriendMessages, loadMoreGroupMessages, scrollToBottom, computed: vue.computed, getCurrentInstance: vue.getCurrentInstance, nextTick: vue.nextTick, onMounted: vue.onMounted, ref: vue.ref, watch: vue.watch, get onShow() {
return onShow;
}, get onUnload() {
return onUnload;
@@ -14891,10 +15046,17 @@ This will fail in production.`);
direction: "vertical",
"scroll-y": "",
"scroll-into-view": $setup.scrollToView,
"upper-threshold": 0,
"upper-threshold": 50,
"scroll-with-animation": true,
onScroll: $setup.onScroll
onScroll: $setup.onScroll,
onScrolltoupper: $setup.onScrollToUpper
}, [
$setup.ChatType === 0 && $setup.isAILoadingMore || $setup.ChatType === 1 && $setup.isFriendLoadingMore || $setup.ChatType === 2 && $setup.isGroupLoadingMore ? (vue.openBlock(), vue.createElementBlock("view", {
key: 0,
class: "load-more-tip"
}, [
vue.createElementVNode("text", null, "加载更多消息...")
])) : vue.createCommentVNode("v-if", true),
(vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
null,
@@ -15003,7 +15165,7 @@ This will fail in production.`);
)),
$setup.ChatType === 1 ? (vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
{ key: 0 },
{ key: 1 },
vue.renderList($setup.currentMessages, (message, index) => {
var _a;
return vue.openBlock(), vue.createElementBlock("view", {
@@ -15096,7 +15258,7 @@ This will fail in production.`);
)) : vue.createCommentVNode("v-if", true),
$setup.ChatType === 2 ? (vue.openBlock(true), vue.createElementBlock(
vue.Fragment,
{ key: 1 },
{ key: 2 },
vue.renderList($setup.currentMessages, (message, index) => {
var _a;
return vue.openBlock(), vue.createElementBlock("view", {