no message
This commit is contained in:
parent
af3b59f8e2
commit
8233411831
50
App.vue
50
App.vue
@ -1,20 +1,58 @@
|
||||
<script>
|
||||
import dbStore from '@/store/db';
|
||||
import dbStore from "@/store/db";
|
||||
import accountStore from "@/store/account";
|
||||
|
||||
export default {
|
||||
onLaunch: function () {
|
||||
console.log('App Launch: ')
|
||||
async onLaunch() {
|
||||
console.log("App Launch: ");
|
||||
|
||||
// 获取 openId 并初始化 IM
|
||||
await this.initIMOnLaunch();
|
||||
},
|
||||
onShow: function () {
|
||||
const db = dbStore();
|
||||
if(db && typeof db.getJobs === 'function'){
|
||||
if (db && typeof db.getJobs === "function") {
|
||||
db.getJobs();
|
||||
}
|
||||
},
|
||||
onHide: function () {
|
||||
console.log('App Hide')
|
||||
console.log("App Hide");
|
||||
},
|
||||
methods: {
|
||||
async initIMOnLaunch() {
|
||||
try {
|
||||
const account = accountStore();
|
||||
|
||||
// 检查是否已有账户信息（包含 openId）
|
||||
const storedAccount = uni.getStorageSync("account");
|
||||
const storedOpenId = uni.getStorageSync("openid");
|
||||
debugger;
|
||||
|
||||
if (storedOpenId) {
|
||||
console.log("检测到已登录的 openId，开始初始化 IM:", storedOpenId);
|
||||
account.openid = storedOpenId;
|
||||
|
||||
// 如果有完整的账户信息，也恢复
|
||||
if (storedAccount) {
|
||||
account.account = storedAccount;
|
||||
}
|
||||
|
||||
// 初始化 IM
|
||||
const success = await account.initIMAfterLogin();
|
||||
if (success) {
|
||||
console.log("IM 初始化成功");
|
||||
} else {
|
||||
console.warn("IM 初始化失败");
|
||||
}
|
||||
} else {
|
||||
console.log("未检测到 openId，跳过 IM 初始化");
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("App Launch 初始化 IM 失败:", error);
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
@ -30,7 +68,6 @@ page {
|
||||
rgba(0, 0, 0, 0.1) 0px -10px 15px -3px, rgba(0, 0, 0, 0.1) 0px -4px 6px -4px;
|
||||
}
|
||||
|
||||
|
||||
.shadow-lg {
|
||||
box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
|
||||
}
|
||||
@ -322,7 +359,6 @@ page {
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
|
||||
.w-0 {
|
||||
width: 0;
|
||||
}
|
||||
|
||||
@ -4,53 +4,55 @@
|
||||
</view>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { ref } from "vue";
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import api from '@/utils/api';
|
||||
import api from "@/utils/api";
|
||||
import { set } from "@/utils/cache";
|
||||
import { toast } from '@/utils/widget';
|
||||
import { toast } from "@/utils/widget";
|
||||
|
||||
const teamId = ref('');
|
||||
const corpId = ref('');
|
||||
const teamId = ref("");
|
||||
const corpId = ref("");
|
||||
const loading = ref(false);
|
||||
const team = ref(null)
|
||||
const team = ref(null);
|
||||
|
||||
async function changeTeam({ teamId, corpId, corpName }) {
|
||||
loading.value = true;
|
||||
const res = await api('getTeamData', { teamId, corpId, withCorpName: true });
|
||||
const res = await api("getTeamData", { teamId, corpId, withCorpName: true });
|
||||
loading.value = false;
|
||||
if (res && res.data) {
|
||||
team.value = res.data;
|
||||
team.value.corpName = corpName;
|
||||
set('invite-team-info', {
|
||||
set("invite-team-info", {
|
||||
corpId: team.value.corpId,
|
||||
teamId: team.value.teamId,
|
||||
corpName: team.value.corpName,
|
||||
teamName: team.value.name,
|
||||
avatars: team.value && Array.isArray(team.value.memberList) ? team.value.memberList.map(item => item.avatar || '') : [],
|
||||
})
|
||||
avatars:
|
||||
team.value && Array.isArray(team.value.memberList)
|
||||
? team.value.memberList.map((item) => item.avatar || "")
|
||||
: [],
|
||||
});
|
||||
uni.redirectTo({
|
||||
url: '/pages/login/login?source=teamInvite'
|
||||
})
|
||||
url: "/pages/login/login?source=teamInvite",
|
||||
});
|
||||
} else {
|
||||
toast(res?.message || '获取团队信息失败')
|
||||
toast(res?.message || "获取团队信息失败");
|
||||
}
|
||||
}
|
||||
|
||||
onLoad(options => {
|
||||
const href = typeof options.q === 'string' ? decodeURIComponent(options.q) : '';
|
||||
const [, url = ''] = href.split('?');
|
||||
const data = url.split('&').reduce((acc, cur) => {
|
||||
console.log(cur)
|
||||
const [key, value] = cur.split('=');
|
||||
console.log(key, '=====', value)
|
||||
onLoad((options) => {
|
||||
const href =
|
||||
typeof options.q === "string" ? decodeURIComponent(options.q) : "";
|
||||
const [, url = ""] = href.split("?");
|
||||
const data = url.split("&").reduce((acc, cur) => {
|
||||
console.log(cur);
|
||||
const [key, value] = cur.split("=");
|
||||
console.log(key, "=====", value);
|
||||
acc[key] = value;
|
||||
return acc;
|
||||
}, {})
|
||||
changeTeam(data)
|
||||
})
|
||||
|
||||
|
||||
}, {});
|
||||
changeTeam(data);
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
.flash-logo {
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<!-- 消息列表项 -->
|
||||
<view
|
||||
v-for="conversation in conversationList"
|
||||
:key="conversation.conversationID"
|
||||
:key="conversation.groupID || conversation.conversationID"
|
||||
class="message-item"
|
||||
@click="handleClickConversation(conversation)"
|
||||
>
|
||||
@ -38,11 +38,15 @@
|
||||
|
||||
<view class="content">
|
||||
<view class="header">
|
||||
<text class="name">{{ conversation.name || "未知群聊" }}</text>
|
||||
<text class="name">{{ conversation.teamName }}</text>
|
||||
|
||||
<text class="time">{{
|
||||
formatMessageTime(conversation.lastMessageTime)
|
||||
}}</text>
|
||||
</view>
|
||||
<view class="patient-info">
|
||||
咨询人 | {{ conversation.patientName }}
|
||||
</view>
|
||||
<view class="message-preview">
|
||||
<text class="preview-text">{{
|
||||
conversation.lastMessage || "暂无消息"
|
||||
@ -76,6 +80,7 @@ import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
|
||||
import { storeToRefs } from "pinia";
|
||||
import useAccountStore from "@/store/account.js";
|
||||
import { globalTimChatManager } from "@/utils/tim-chat.js";
|
||||
import { mergeConversationWithGroupDetails } from "@/utils/conversation-merger.js";
|
||||
|
||||
// 获取登录状态
|
||||
const { account, openid, isIMInitialized } = storeToRefs(useAccountStore());
|
||||
@ -90,21 +95,47 @@ const refreshing = ref(false);
|
||||
|
||||
// 初始化IM
|
||||
const initIM = async () => {
|
||||
console.log("=== message.vue initIM 开始 ===");
|
||||
console.log("isIMInitialized:", isIMInitialized.value);
|
||||
console.log("globalTimChatManager 存在:", !!globalTimChatManager);
|
||||
console.log("globalTimChatManager.tim 存在:", !!globalTimChatManager?.tim);
|
||||
console.log(
|
||||
"globalTimChatManager.isLoggedIn:",
|
||||
globalTimChatManager?.isLoggedIn
|
||||
);
|
||||
|
||||
if (!isIMInitialized.value) {
|
||||
uni.showLoading({
|
||||
title: "连接中...",
|
||||
});
|
||||
|
||||
console.log("开始调用 initIMAfterLogin");
|
||||
const success = await initIMAfterLogin();
|
||||
console.log("initIMAfterLogin 返回:", success);
|
||||
|
||||
uni.hideLoading();
|
||||
|
||||
if (!success) {
|
||||
console.error("initIMAfterLogin 失败");
|
||||
uni.showToast({
|
||||
title: "IM连接失败，请重试",
|
||||
icon: "none",
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
console.log("initIMAfterLogin 成功后检查:");
|
||||
console.log("- globalTimChatManager 存在:", !!globalTimChatManager);
|
||||
console.log(
|
||||
"- globalTimChatManager.tim 存在:",
|
||||
!!globalTimChatManager?.tim
|
||||
);
|
||||
console.log(
|
||||
"- globalTimChatManager.isLoggedIn:",
|
||||
globalTimChatManager?.isLoggedIn
|
||||
);
|
||||
} else if (globalTimChatManager && !globalTimChatManager.isLoggedIn) {
|
||||
console.log("IM 已初始化但未登录，尝试重连");
|
||||
uni.showLoading({
|
||||
title: "重连中...",
|
||||
});
|
||||
@ -112,9 +143,12 @@ const initIM = async () => {
|
||||
uni.hideLoading();
|
||||
|
||||
if (!reconnected) {
|
||||
console.error("重连失败");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
console.log("=== message.vue initIM 完成 ===");
|
||||
return true;
|
||||
};
|
||||
|
||||
@ -125,33 +159,32 @@ const loadConversationList = async () => {
|
||||
|
||||
try {
|
||||
console.log("开始加载群聊列表");
|
||||
if (!globalTimChatManager || !globalTimChatManager.getGroupList) {
|
||||
|
||||
// 验证 IM 管理器和 TIM 实例是否存在
|
||||
if (!globalTimChatManager) {
|
||||
throw new Error("IM管理器未初始化");
|
||||
}
|
||||
|
||||
if (!globalTimChatManager.tim) {
|
||||
console.error("TIM实例不存在，尝试重新初始化");
|
||||
const imReady = await initIM();
|
||||
if (!imReady || !globalTimChatManager.tim) {
|
||||
throw new Error("TIM实例初始化失败");
|
||||
}
|
||||
}
|
||||
|
||||
if (!globalTimChatManager.getGroupList) {
|
||||
throw new Error("getGroupList 方法不存在");
|
||||
}
|
||||
|
||||
// 直接调用getGroupList，它会自动等待SDK就绪
|
||||
const result = await globalTimChatManager.getGroupList();
|
||||
if (result && result.success && result.groupList) {
|
||||
conversationList.value = result.groupList
|
||||
.map((group) => ({
|
||||
conversationID: group.conversationID || `GROUP${group.groupID}`,
|
||||
groupID: group.groupID,
|
||||
name: group.patientName
|
||||
? `${group.patientName}的问诊`
|
||||
: group.name || "问诊群聊",
|
||||
avatar: group.avatar || "/static/default-avatar.png",
|
||||
lastMessage: group.lastMessage || "暂无消息",
|
||||
lastMessageTime: group.lastMessageTime || Date.now(),
|
||||
unreadCount: group.unreadCount || 0,
|
||||
doctorId: group.doctorId,
|
||||
patientName: group.patientName,
|
||||
}))
|
||||
.sort((a, b) => b.lastMessageTime - a.lastMessageTime);
|
||||
|
||||
console.log(
|
||||
"群聊列表加载成功，共",
|
||||
conversationList.value.length,
|
||||
"个会话"
|
||||
// 合并后端群组详细信息（已包含格式化和排序）
|
||||
conversationList.value = await mergeConversationWithGroupDetails(
|
||||
result.groupList
|
||||
);
|
||||
console.log("群聊列表加载成功，共", conversationList.value, "个会话");
|
||||
} else {
|
||||
console.error("加载群聊列表失败:", result);
|
||||
uni.showToast({
|
||||
@ -170,6 +203,9 @@ const loadConversationList = async () => {
|
||||
}
|
||||
};
|
||||
|
||||
// 防抖更新定时器
|
||||
let updateTimer = null;
|
||||
|
||||
// 设置会话列表监听，实时更新列表
|
||||
const setupConversationListener = () => {
|
||||
if (!globalTimChatManager) return;
|
||||
@ -186,7 +222,7 @@ const setupConversationListener = () => {
|
||||
);
|
||||
|
||||
if (existingIndex !== -1) {
|
||||
// 更新未读数
|
||||
// 直接更新未读数，避免触发整个对象的响应式更新
|
||||
if (eventData.unreadCount !== undefined) {
|
||||
conversationList.value[existingIndex].unreadCount =
|
||||
eventData.unreadCount;
|
||||
@ -204,6 +240,12 @@ const setupConversationListener = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
// 防抖处理：避免频繁更新导致闪动
|
||||
if (updateTimer) {
|
||||
clearTimeout(updateTimer);
|
||||
}
|
||||
|
||||
updateTimer = setTimeout(async () => {
|
||||
// 过滤出群聊会话
|
||||
const groupConversations = eventData.filter(
|
||||
(conv) => conv.conversationID && conv.conversationID.startsWith("GROUP")
|
||||
@ -211,34 +253,63 @@ const setupConversationListener = () => {
|
||||
|
||||
console.log(`收到 ${groupConversations.length} 个群聊会话更新`);
|
||||
|
||||
// 更新会话列表 - 使用 tim-chat.js 中的格式化方法
|
||||
groupConversations.forEach((updatedConv) => {
|
||||
const conversationID = updatedConv.conversationID;
|
||||
// 使用 TimChatManager 的格式化方法转换为标准格式
|
||||
const formattedConversations = groupConversations.map((conv) =>
|
||||
globalTimChatManager.formatConversationData(conv)
|
||||
);
|
||||
|
||||
// 合并后端群组详细信息（已包含格式化和排序）
|
||||
const mergedConversations = await mergeConversationWithGroupDetails(
|
||||
formattedConversations
|
||||
);
|
||||
|
||||
if (!mergedConversations || mergedConversations.length === 0) {
|
||||
console.log("合并后的会话数据为空，跳过更新");
|
||||
return;
|
||||
}
|
||||
|
||||
let needSort = false;
|
||||
|
||||
// 更新会话列表
|
||||
mergedConversations.forEach((conversationData) => {
|
||||
const conversationID = conversationData.conversationID;
|
||||
const existingIndex = conversationList.value.findIndex(
|
||||
(conv) => conv.conversationID === conversationID
|
||||
);
|
||||
|
||||
// 使用 TimChatManager 的格式化方法
|
||||
const conversationData =
|
||||
globalTimChatManager.formatConversationData(updatedConv);
|
||||
|
||||
if (existingIndex !== -1) {
|
||||
// 更新现有会话
|
||||
conversationList.value[existingIndex] = conversationData;
|
||||
const existing = conversationList.value[existingIndex];
|
||||
// 只在关键字段变化时才更新，减少不必要的渲染
|
||||
if (
|
||||
existing.lastMessage !== conversationData.lastMessage ||
|
||||
existing.lastMessageTime !== conversationData.lastMessageTime ||
|
||||
existing.unreadCount !== conversationData.unreadCount
|
||||
) {
|
||||
// 使用 Object.assign 更新，保持引用稳定
|
||||
Object.assign(
|
||||
conversationList.value[existingIndex],
|
||||
conversationData
|
||||
);
|
||||
needSort = true;
|
||||
console.log(
|
||||
`已更新会话: ${conversationData.name}, unreadCount: ${conversationData.unreadCount}`
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// 添加新会话
|
||||
conversationList.value.push(conversationData);
|
||||
needSort = true;
|
||||
console.log(`已添加新会话: ${conversationData.name}`);
|
||||
}
|
||||
});
|
||||
|
||||
// 按最后消息时间排序（最新的在前）
|
||||
// 只在需要时才排序
|
||||
if (needSort) {
|
||||
conversationList.value.sort(
|
||||
(a, b) => b.lastMessageTime - a.lastMessageTime
|
||||
);
|
||||
}
|
||||
}, 100); // 100ms 防抖延迟
|
||||
});
|
||||
|
||||
// 监听消息接收事件（用于更新未读数）
|
||||
@ -369,22 +440,36 @@ onLoad(() => {
|
||||
// 页面显示
|
||||
onShow(async () => {
|
||||
try {
|
||||
console.log("消息列表页面显示，开始初始化");
|
||||
|
||||
// 初始化IM
|
||||
const imReady = await initIM();
|
||||
if (!imReady) {
|
||||
console.error("IM初始化失败");
|
||||
uni.showToast({
|
||||
title: "连接失败，请重试",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// 二次验证：确保 TIM 实例存在
|
||||
if (!globalTimChatManager || !globalTimChatManager.tim) {
|
||||
console.error("IM初始化后 TIM 实例仍不存在");
|
||||
uni.showToast({
|
||||
title: "初始化异常，请重启应用",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
// 先加载初始会话列表
|
||||
await loadConversationList();
|
||||
|
||||
// 再设置监听器，后续通过事件更新列表
|
||||
setupConversationListener();
|
||||
} catch (error) {
|
||||
console.error("页面初始化失败:", error);
|
||||
uni.showToast({
|
||||
title: "初始化失败，请重试",
|
||||
title: error.message || "初始化失败，请重试",
|
||||
icon: "none",
|
||||
});
|
||||
}
|
||||
@ -392,6 +477,12 @@ onShow(async () => {
|
||||
|
||||
// 页面隐藏
|
||||
onHide(() => {
|
||||
// 清除防抖定时器
|
||||
if (updateTimer) {
|
||||
clearTimeout(updateTimer);
|
||||
updateTimer = null;
|
||||
}
|
||||
|
||||
// 移除消息监听
|
||||
if (globalTimChatManager) {
|
||||
globalTimChatManager.setCallback("onConversationListUpdated", null);
|
||||
@ -518,8 +609,8 @@ onHide(() => {
|
||||
}
|
||||
|
||||
.preview-text {
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
font-size: 26rpx;
|
||||
// color: #999;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
@ -534,4 +625,10 @@ onHide(() => {
|
||||
font-size: 24rpx;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.patient-info {
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
padding-bottom: 10rpx;
|
||||
}
|
||||
</style>
|
||||
|
||||
BIN
static/icon/zhaopian.png
Normal file
BIN
static/icon/zhaopian.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
@ -32,6 +32,11 @@ export default defineStore("accountStore", () => {
|
||||
if (res.success && res.data && res.data.mobile) {
|
||||
account.value = res.data;
|
||||
openid.value = res.data.openid;
|
||||
|
||||
// 保存账户信息和 openId 到本地存储
|
||||
uni.setStorageSync('account', res.data);
|
||||
uni.setStorageSync('openid', res.data.openid);
|
||||
|
||||
initIMAfterLogin(openid.value)
|
||||
return res.data
|
||||
}
|
||||
@ -48,8 +53,29 @@ export default defineStore("accountStore", () => {
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
await initGlobalTIM();
|
||||
// 使用 openid 作为 userID 初始化 IM
|
||||
const userID = openid.value || uni.getStorageSync('openid');
|
||||
if (!userID) {
|
||||
console.error('无法获取 openid，IM 初始化失败');
|
||||
return false;
|
||||
}
|
||||
|
||||
console.log('开始初始化 IM，userID:', userID);
|
||||
const success = await initGlobalTIM(userID);
|
||||
|
||||
if (!success) {
|
||||
console.error('initGlobalTIM 返回失败');
|
||||
return false;
|
||||
}
|
||||
|
||||
// 验证 TIM 实例是否真正创建成功
|
||||
if (!globalTimChatManager || !globalTimChatManager.tim) {
|
||||
console.error('IM 初始化后 TIM 实例不存在');
|
||||
return false;
|
||||
}
|
||||
|
||||
isIMInitialized.value = true;
|
||||
console.log('IM 初始化成功');
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.error('IM初始化失败:', error);
|
||||
@ -73,6 +99,10 @@ export default defineStore("accountStore", () => {
|
||||
account.value = null;
|
||||
openid.value = "";
|
||||
isIMInitialized.value = false;
|
||||
|
||||
// 清除本地存储
|
||||
uni.removeStorageSync('account');
|
||||
uni.removeStorageSync('openid');
|
||||
}
|
||||
|
||||
return { account, login, initIMAfterLogin, logout, openid, isIMInitialized }
|
||||
|
||||
@ -57,7 +57,8 @@ const urlsConfig = {
|
||||
endConsultation: "endConsultation",
|
||||
getGroupListByGroupId: "getGroupListByGroupId",
|
||||
createConsultGroup: "createConsultGroup",
|
||||
cancelConsultApplication: "cancelConsultApplication"
|
||||
cancelConsultApplication: "cancelConsultApplication",
|
||||
getGroupList: "getGroupList"
|
||||
}
|
||||
}
|
||||
const urls = Object.keys(urlsConfig).reduce((acc, path) => {
|
||||
|
||||
199
utils/conversation-merger.js
Normal file
199
utils/conversation-merger.js
Normal file
@ -0,0 +1,199 @@
|
||||
/**
|
||||
* 会话列表与群组详细信息合并工具
|
||||
*
|
||||
* 功能：
|
||||
* 1. 从 conversationList 中提取所有 groupID
|
||||
* 2. 调用后端 getGroupList 接口获取群组详细信息
|
||||
* 3. 合并会话数据和患者信息
|
||||
* 4. 过滤掉后端不存在的会话
|
||||
*/
|
||||
|
||||
import api from "@/utils/api.js"
|
||||
|
||||
/**
|
||||
* 合并会话列表和群组详细信息
|
||||
*
|
||||
* @param {Array} conversationList - 前端会话列表
|
||||
* @param {Object} options - 可选参数
|
||||
* @param {string} options.corpId - 企业ID（可选）
|
||||
* @param {string} options.teamId - 团队ID（可选）
|
||||
* @param {string} options.keyword - 搜索关键词（可选）
|
||||
* @returns {Promise<Array>} 合并后的会话列表
|
||||
*/
|
||||
export async function mergeConversationWithGroupDetails(conversationList, options = {}) {
|
||||
try {
|
||||
// 1. 参数校验
|
||||
if (!Array.isArray(conversationList) || conversationList.length === 0) {
|
||||
console.log('会话列表为空，无需合并')
|
||||
return []
|
||||
}
|
||||
|
||||
// 2. 提取所有 groupID
|
||||
const groupIds = conversationList
|
||||
.map(conv => conv.groupID)
|
||||
.filter(id => id) // 过滤掉空值
|
||||
|
||||
if (groupIds.length === 0) {
|
||||
console.log('没有有效的 groupID，无需合并')
|
||||
return []
|
||||
}
|
||||
|
||||
console.log('提取到的 groupID 列表:', groupIds)
|
||||
|
||||
// 3. 调用后端接口获取群组详细信息
|
||||
const requestData = {
|
||||
groupIds,
|
||||
...options // 支持传入额外的查询参数（corpId, teamId, keyword等）
|
||||
}
|
||||
|
||||
const response = await api('getGroupList', requestData)
|
||||
|
||||
// 4. 检查响应
|
||||
if (!response || !response.success) {
|
||||
console.error('获取群组详细信息失败:', response?.message || '未知错误')
|
||||
return []
|
||||
}
|
||||
|
||||
const groupDetailsMap = createGroupDetailsMap(response.data?.list || [])
|
||||
console.log('获取到的群组详细信息数量:', Object.keys(groupDetailsMap).size)
|
||||
|
||||
// 5. 合并数据并过滤
|
||||
const mergedList = conversationList
|
||||
.map(conversation => mergeConversationData(conversation, groupDetailsMap))
|
||||
.filter(item => item !== null) // 过滤掉后端不存在的会话
|
||||
|
||||
console.log('合并后的会话列表数量:', mergedList.length)
|
||||
console.log('过滤掉的会话数量:', conversationList.length - mergedList.length)
|
||||
|
||||
// 6. 格式化并排序会话列表
|
||||
const formattedList = mergedList.sort((a, b) => b.lastMessageTime - a.lastMessageTime)
|
||||
|
||||
return formattedList
|
||||
|
||||
} catch (error) {
|
||||
console.error('合并会话列表失败:', error)
|
||||
// 发生错误时返回空数组，避免影响页面渲染
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建群组详细信息映射表
|
||||
*
|
||||
* @param {Array} groupDetailsList - 后端返回的群组详细信息列表
|
||||
* @returns {Map} groupID -> 群组详细信息的映射
|
||||
*/
|
||||
function createGroupDetailsMap(groupDetailsList) {
|
||||
const map = new Map()
|
||||
|
||||
groupDetailsList.forEach(groupDetail => {
|
||||
if (groupDetail.groupId) {
|
||||
map.set(groupDetail.groupId, groupDetail)
|
||||
}
|
||||
})
|
||||
|
||||
return map
|
||||
}
|
||||
|
||||
/**
|
||||
* 合并单个会话数据
|
||||
*
|
||||
* @param {Object} conversation - 前端会话数据
|
||||
* @param {Map} groupDetailsMap - 群组详细信息映射表
|
||||
* @returns {Object|null} 合并后的会话数据，如果后端不存在则返回 null
|
||||
*/
|
||||
function mergeConversationData(conversation, groupDetailsMap) {
|
||||
const groupDetail = groupDetailsMap.get(conversation.groupID)
|
||||
// 如果后端没有该群组信息，返回 null（会被过滤掉）
|
||||
if (!groupDetail) {
|
||||
console.log(`会话 ${conversation.groupID} 在后端不存在，已过滤`)
|
||||
return null
|
||||
}
|
||||
|
||||
// 合并数据
|
||||
return {
|
||||
// 保留原有的会话信息
|
||||
...conversation,
|
||||
|
||||
// 合并后端的群组信息
|
||||
_id: groupDetail._id,
|
||||
corpId: groupDetail.corpId,
|
||||
teamId: groupDetail.teamId,
|
||||
customerId: groupDetail.customerId,
|
||||
doctorId: groupDetail.doctorId,
|
||||
patientId: groupDetail.patientId,
|
||||
orderStatus: groupDetail.orderStatus,
|
||||
|
||||
// 合并患者信息（优先使用后端数据）
|
||||
patientName: groupDetail.patientName || conversation.patientName,
|
||||
patientSex: groupDetail.patient?.sex,
|
||||
patientAge: groupDetail.patient?.age,
|
||||
patientMobile: groupDetail.patient?.mobile,
|
||||
patientAvatar: groupDetail.patient?.avatar || conversation.avatar,
|
||||
|
||||
// 合并团队信息
|
||||
teamName: groupDetail.team?.name,
|
||||
teamMemberList: groupDetail.team?.memberList,
|
||||
teamDescription: groupDetail.team?.description,
|
||||
|
||||
// 时间信息
|
||||
createdAt: groupDetail.createdAt,
|
||||
updatedAt: groupDetail.updatedAt,
|
||||
|
||||
// 更新显示名称（使用后端的患者信息）
|
||||
name: formatConversationName(groupDetail),
|
||||
|
||||
// 更新头像
|
||||
avatar: groupDetail.patient?.avatar || conversation.avatar || '/static/default-avatar.png'
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 格式化会话显示名称
|
||||
*
|
||||
* @param {Object} groupDetail - 群组详细信息
|
||||
* @returns {string} 格式化后的名称
|
||||
*/
|
||||
function formatConversationName(groupDetail) {
|
||||
const patientName = groupDetail.patientName || '患者'
|
||||
const sex = groupDetail.patient?.sex === 1 ? '男' : groupDetail.patient?.sex === 2 ? '女' : ''
|
||||
const age = groupDetail.patient?.age ? `${groupDetail.patient.age}岁` : ''
|
||||
|
||||
// 拼接名称：患者名 性别 年龄
|
||||
const nameParts = [patientName, sex, age].filter(part => part)
|
||||
const displayName = nameParts.join(' ')
|
||||
|
||||
return `${displayName}的问诊`
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量合并会话列表（支持分页）
|
||||
*
|
||||
* @param {Array} conversationList - 前端会话列表
|
||||
* @param {Object} options - 可选参数
|
||||
* @param {number} options.batchSize - 每批处理的数量（默认50）
|
||||
* @returns {Promise<Array>} 合并后的会话列表
|
||||
*/
|
||||
export async function mergeConversationWithGroupDetailsBatch(conversationList, options = {}) {
|
||||
const { batchSize = 50, ...otherOptions } = options
|
||||
|
||||
if (!Array.isArray(conversationList) || conversationList.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
// 分批处理
|
||||
const batches = []
|
||||
for (let i = 0; i < conversationList.length; i += batchSize) {
|
||||
batches.push(conversationList.slice(i, i + batchSize))
|
||||
}
|
||||
|
||||
console.log(`会话列表分为 ${batches.length} 批处理，每批 ${batchSize} 条`)
|
||||
|
||||
// 并发处理所有批次
|
||||
const results = await Promise.all(
|
||||
batches.map(batch => mergeConversationWithGroupDetails(batch, otherOptions))
|
||||
)
|
||||
|
||||
// 合并所有结果
|
||||
return results.flat()
|
||||
}
|
||||
@ -149,6 +149,7 @@ class TimChatManager {
|
||||
|
||||
this.isInitializing = true
|
||||
console.log('=== 开始初始化IM ===')
|
||||
console.log('传入的 userID:', userID)
|
||||
|
||||
try {
|
||||
// 重置重连次数，允许重新登录
|
||||
@ -170,9 +171,12 @@ class TimChatManager {
|
||||
|
||||
console.log('创建TIM实例，SDKAppID:', TIM_CONFIG.SDKAppID)
|
||||
this.tim = TIM.create({ SDKAppID: TIM_CONFIG.SDKAppID })
|
||||
console.log('TIM实例创建成功:', !!this.tim)
|
||||
|
||||
// 等待TIM实例初始化完成
|
||||
console.log('等待TIM实例就绪...')
|
||||
await this.waitForTIMInstanceReady()
|
||||
console.log('TIM实例已就绪')
|
||||
|
||||
// 注册上传插件
|
||||
this.tim.registerPlugin({ "tim-upload-plugin": TIMUploadPlugin })
|
||||
@ -180,6 +184,7 @@ class TimChatManager {
|
||||
|
||||
// 注册事件监听器
|
||||
this.registerEventListeners()
|
||||
console.log('事件监听器已注册')
|
||||
|
||||
// 设置日志级别
|
||||
if (typeof this.tim.setLogLevel === 'function') {
|
||||
@ -187,21 +192,29 @@ class TimChatManager {
|
||||
}
|
||||
|
||||
// 获取用户信息并登录
|
||||
console.log('开始获取用户信息并登录...')
|
||||
await this.getUserInfoAndLogin(userID)
|
||||
console.log('用户信息获取并登录成功')
|
||||
|
||||
// 等待SDK Ready
|
||||
console.log('等待SDK Ready...')
|
||||
await this.waitForSDKReady(IM_CONNECTION_CONFIG.SDK_READY_TIMEOUT)
|
||||
|
||||
console.log('=== IM初始化完成 ===')
|
||||
console.log('最终状态 - this.tim 存在:', !!this.tim)
|
||||
console.log('最终状态 - this.isLoggedIn:', this.isLoggedIn)
|
||||
return true
|
||||
|
||||
} catch (error) {
|
||||
console.error('=== IM初始化失败 ===', error)
|
||||
console.error('错误详情:', error.message || error)
|
||||
console.error('错误堆栈:', error.stack)
|
||||
this.triggerCallback('onError', `初始化失败: ${error.message || error}`)
|
||||
|
||||
// 初始化失败时清理资源
|
||||
console.log('初始化失败，开始清理资源...')
|
||||
await this.cleanupOldInstance()
|
||||
console.log('资源清理完成，this.tim 已设为 null')
|
||||
return false
|
||||
} finally {
|
||||
this.isInitializing = false
|
||||
@ -365,20 +378,34 @@ class TimChatManager {
|
||||
|
||||
async getUserInfoAndLogin(userID) {
|
||||
try {
|
||||
console.log('getUserInfoAndLogin 开始，传入 userID:', userID)
|
||||
|
||||
if (userID) {
|
||||
this.currentUserID = userID
|
||||
uni.setStorageSync('userInfo', { userID })
|
||||
console.log('使用传入的 userID:', userID)
|
||||
} else {
|
||||
console.log('未传入 userID，尝试从本地存储获取')
|
||||
const userInfo = uni.getStorageSync('userInfo')
|
||||
console.log('本地存储的 userInfo:', userInfo)
|
||||
|
||||
if (!userInfo?.userID) {
|
||||
throw new Error('未找到用户信息，请先登录')
|
||||
}
|
||||
this.currentUserID = userInfo.userID
|
||||
console.log('从本地存储获取到 userID:', this.currentUserID)
|
||||
}
|
||||
|
||||
console.log('开始获取 userSig...')
|
||||
this.currentUserSig = await this.getUserSig(this.currentUserID)
|
||||
console.log('userSig 获取成功')
|
||||
|
||||
console.log('开始登录 TIM...')
|
||||
await this.loginTIM()
|
||||
console.log('TIM 登录成功')
|
||||
} catch (error) {
|
||||
console.error('获取用户信息失败:', error)
|
||||
console.error('错误详情:', error.message || error)
|
||||
this.triggerCallback('onError', `登录失败: ${error.message || error}`)
|
||||
throw error // 重新抛出错误，让调用者知道登录失败
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user